diff --git a/.idea/EdisonEngine.iml b/.idea/EdisonEngine.iml
index e62165852..fd894181e 100644
--- a/.idea/EdisonEngine.iml
+++ b/.idea/EdisonEngine.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module classpath="CMake" type="CPP_MODULE" version="4">
+<module classpath="CIDR" type="CPP_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Python" name="Python facet">
-      <configuration sdkName="Python 3.8" />
+      <configuration sdkName="Python 3.10" />
     </facet>
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6a67294b6..9eddd6264 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -11,6 +11,9 @@
     <CMakeCodeStyleSettings>
       <option name="FORCE_COMMANDS_CASE" value="1" />
     </CMakeCodeStyleSettings>
+    <RiderCodeStyleSettings>
+      <option name="/Default/CodeStyle/CodeFormatting/CppClangFormat/EnableClangFormatSupport/@EntryValue" value="true" type="bool" />
+    </RiderCodeStyleSettings>
     <clangFormatSettings>
       <option name="ENABLED" value="true" />
     </clangFormatSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 92c9c4252..e51d77854 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <option name="sdkName" value="Python 3.8" />
   </component>
   <component name="CMakePythonSetting">
-    <option name="pythonIntegrationState" value="NO" />
+    <option name="pythonIntegrationState" value="YES" />
   </component>
   <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
   <component name="CidrRootsConfiguration">
diff --git a/3rdparty/ValveFileVDF b/3rdparty/ValveFileVDF
index c8adfc29e..277a5836e 160000
--- a/3rdparty/ValveFileVDF
+++ b/3rdparty/ValveFileVDF
@@ -1 +1 @@
-Subproject commit c8adfc29e62cc980b595e965bedfb239087647ff
+Subproject commit 277a5836e76b59d958847beb169ae1ac04238d19
diff --git a/3rdparty/rapidyaml b/3rdparty/rapidyaml
index 9b8df62d9..653eac974 160000
--- a/3rdparty/rapidyaml
+++ b/3rdparty/rapidyaml
@@ -1 +1 @@
-Subproject commit 9b8df62d9a45c050804305462b243add936c9292
+Subproject commit 653eac9741c7728f2a87435b981737894149e002
diff --git a/cmake/get_cimg.cmake b/cmake/get_cimg.cmake
index 9db59cf6c..89c2196f4 100644
--- a/cmake/get_cimg.cmake
+++ b/cmake/get_cimg.cmake
@@ -4,7 +4,7 @@ endif()
 
 include( ./dl_unpack )
 
-set( _cimg_version "v.3.4.3" )
+set( _cimg_version "v.3.5.3" )
 dl_unpack(
         URL https://github.com/GreycLab/CImg/archive/${_cimg_version}.tar.gz
         FILENAME CImg-${_cimg_version}.tar.gz
diff --git a/cmake/get_glm.cmake b/cmake/get_glm.cmake
index b0cb5e4c4..a6aea8436 100644
--- a/cmake/get_glm.cmake
+++ b/cmake/get_glm.cmake
@@ -14,4 +14,4 @@ dl_unpack(
 
 add_library( glm::glm INTERFACE IMPORTED )
 target_include_directories( glm::glm SYSTEM BEFORE INTERFACE "${EXTERNAL_SRC_ROOT}/glm-${_glm_version}" )
-target_compile_definitions( glm::glm INTERFACE -DGLM_ENABLE_EXPERIMENTAL )
+target_compile_definitions( glm::glm INTERFACE -DGLM_ENABLE_EXPERIMENTAL -DGLM_FORCE_SSE42 -DGLM_FORCE_CXX${CMAKE_CXX_STANDARD} )
diff --git a/cmake/get_gsllite.cmake b/cmake/get_gsllite.cmake
index c131d5354..591a47650 100644
--- a/cmake/get_gsllite.cmake
+++ b/cmake/get_gsllite.cmake
@@ -4,7 +4,7 @@ endif()
 
 include( ./dl_unpack )
 
-set( _gsl_lite_version "0.42.0" )
+set( _gsl_lite_version "1.0.1" )
 dl_unpack(
         URL https://github.com/gsl-lite/gsl-lite/archive/refs/tags/v${_gsl_lite_version}.tar.gz
         FILENAME gsl-lite-v${_gsl_lite_version}.tar.gz
@@ -19,6 +19,8 @@ target_compile_definitions(
         -Dgsl_FEATURE_MAKE_SPAN_TO_STD=${CMAKE_CXX_STANDARD}
         -Dgsl_FEATURE_BYTE_SPAN_TO_STD=${CMAKE_CXX_STANDARD}
         -Dgsl_CONFIG_NOT_NULL_EXPLICIT_CTOR=1
+        -Dgsl_CONFIG_TRANSPARENT_NOT_NULL=0
         -Dgsl_CONFIG_CONTRACT_VIOLATION_CALLS_HANDLER
-        -Dgsl_CPLUSPLUS=201703L
+        -Dgsl_CONFIG_DEFAULTS_VERSION=1
+        -Dgsl_CPLUSPLUS=202002L
 )
diff --git a/cmake/get_valvefilevdf.cmake b/cmake/get_valvefilevdf.cmake
index 4f24d23b8..a043bc980 100644
--- a/cmake/get_valvefilevdf.cmake
+++ b/cmake/get_valvefilevdf.cmake
@@ -5,4 +5,4 @@ endif()
 include( ./dl_unpack )
 
 add_library( valve-file-vdf::valve-file-vdf INTERFACE IMPORTED )
-target_include_directories( valve-file-vdf::valve-file-vdf INTERFACE "${EXTERNAL_SRC_ROOT}/ValveFileVDF" )
+target_include_directories( valve-file-vdf::valve-file-vdf INTERFACE "${EXTERNAL_SRC_ROOT}/ValveFileVDF/include" )
diff --git a/cmake/scripts/wrap_enum.py b/cmake/scripts/wrap_enum.py
index bf4bcb7ee..ce80bef6c 100644
--- a/cmake/scripts/wrap_enum.py
+++ b/cmake/scripts/wrap_enum.py
@@ -23,7 +23,7 @@ def generate_header_lines(args, enums: List[Tuple[str, str]]) -> Iterable[str]:
     yield "#pragma once"
     yield ""
     yield "#include <cstdint>"
-    yield "#include <gsl/gsl-lite.hpp>"
+    yield "#include <gsl-lite/gsl-lite.hpp>"
     yield "#include <map>"
     yield "#include <string>"
     for include in args.with_includes:
@@ -66,7 +66,7 @@ def generate_impl_lines(args, enums: List[Tuple[str, str]], include_path: Path)
     yield f"#include \"{include_path.as_posix()}\""
     yield ""
     yield "#include <cstdint>"
-    yield "#include <gsl/gsl-lite.hpp>"
+    yield "#include <gsl-lite/gsl-lite.hpp>"
     yield "#include <map>"
     yield "#include <stdexcept>"
     yield "#include <string>"
diff --git a/cmake/toolchain_config.cmake b/cmake/toolchain_config.cmake
index 4ebe14b51..9afc55431 100644
--- a/cmake/toolchain_config.cmake
+++ b/cmake/toolchain_config.cmake
@@ -1,4 +1,4 @@
-set( CMAKE_CXX_STANDARD 17 )
+set( CMAKE_CXX_STANDARD 20 )
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
 
 include( CheckPIESupported )
diff --git a/deprecations.txt b/deprecations.txt
index 1486f0bc8..bfb89b0a3 100644
--- a/deprecations.txt
+++ b/deprecations.txt
@@ -1 +1,2 @@
 CE-675 2.8 Remove doppelganger save migration
+CE-378 2.9 Remove CameraController save migrations
diff --git a/dev-docs/README.md b/dev-docs/README.md
index dbdf204c6..2651b5e8d 100644
--- a/dev-docs/README.md
+++ b/dev-docs/README.md
@@ -118,7 +118,7 @@ the prior level ends during the stats screen.
 First, the engine initializes the script engine for the chosen game-flow. Then, the engine sets up a `Presenter`, which
 basically is a container around everything a user can sense - audio and video currently, but may also include gamepad
 rumble effects in the future once it's implemented in GLFW (blocked
-by [issue #57](https://github.com/glfw/glfw/issues/57) and [pull 1687](https://github.com/glfw/glfw/pull/1678)). The
+by [issue #57](https://github.com/glfw/glfw/issues/57) and [pull #1678](https://github.com/glfw/glfw/pull/1678)). The
 presenter also handles the [`hid`](#hid) and OpenGL window using [`soglb`](#soglb).
 
 Once the `Presenter` is initialized, the user's chosen render settings are applied, their input config is applied, and (
@@ -166,7 +166,12 @@ different animation state handler.
 ### objects
 
 Contains everything that defines the game entities. The enemies' behaviours are defined here, as well as objects'
-behaviours. The `update()` function is called each frame for every active object. There are usually custom serialization
+behaviours. The `updateLogic()` function is called each logic tick (30 FPS) for every active object. To support smooth
+rendering at higher frame rates, the engine uses a predictive interpolation system. At the end of each logic tick,
+`applyLogicTransform()` is called to calculate the predicted state for the next tick. During rendering,
+`interpolateTransform()` lerps between the current and predicted states.
+
+There are usually custom serialization
 overrides for entities that have specific state variables (see also [`serialization`](#serialization)), and also custom
 `collide()` overrides to handle collisions with Lara (like the hand of Midas or switches). Some entities like bridges
 are also able to change the effective ceiling or floor height when they're activated through [`floordata`](#floordata).
diff --git a/iwyu-mappings.yaml b/iwyu-mappings.yaml
index 2d080317f..8c2b15988 100644
--- a/iwyu-mappings.yaml
+++ b/iwyu-mappings.yaml
@@ -58,7 +58,7 @@
 
 - include: [ "@<pybind11/detail/.*>", "private", "<pybind11/pybind11.h>", "public" ]
 
-- symbol: [ "gsl::not_null", "private", "<gsl/gsl-lite.hpp>", "public" ]
+- symbol: [ "gsl::not_null", "private", "<gsl-lite/gsl-lite.hpp>", "public" ]
 
 - symbol: [ "serialization::Serializer", "private", "\"serialization/serialization_fwd.h\"", "public" ]
 
diff --git a/share/shaders/bindings.glsl b/share/shaders/bindings.glsl
new file mode 100644
index 000000000..a896810fb
--- /dev/null
+++ b/share/shaders/bindings.glsl
@@ -0,0 +1,8 @@
+#define BINDING_UNIFORM_TRANSFORM 0
+#define BINDING_UNIFORM_CAMERA 1
+#define BINDING_UNIFORM_CSM 2
+#define BINDING_BUFFER_LIGHTS 3
+#define BINDING_BUFFER_DYN_LIGHTS 4
+#define BINDING_UNIFORM_CSMVSM 4
+#define BINDING_BUFFER_BONE_TRANSFORM 10
+#define BINDING_BUFFER_NEXT_BONE_TRANSFORM 11
diff --git a/share/shaders/bloom_upsample.frag b/share/shaders/bloom_upsample.frag
index ea9aebcfa..4552319f0 100644
--- a/share/shaders/bloom_upsample.frag
+++ b/share/shaders/bloom_upsample.frag
@@ -7,20 +7,13 @@ layout(location=0) out vec3 out_tex;
 void main()
 {
     const vec2 texelSize = 1.0 / vec2(textureSize(u_input, 0));
-    const float x = texelSize.x;
-    const float y = texelSize.y;
+    const float x = texelSize.x * 0.5;
+    const float y = texelSize.y * 0.5;
 
-    vec3 a = texture(u_input, vec2(fpi.texCoord.x - x, fpi.texCoord.y + y)).rgb;
-    vec3 b = texture(u_input, vec2(fpi.texCoord.x, fpi.texCoord.y + y)).rgb;
-    vec3 c = texture(u_input, vec2(fpi.texCoord.x + x, fpi.texCoord.y + y)).rgb;
+    vec3 a = texture(u_input, fpi.texCoord + vec2(-x, y)).rgb;
+    vec3 b = texture(u_input, fpi.texCoord + vec2(x, y)).rgb;
+    vec3 c = texture(u_input, fpi.texCoord + vec2(-x, -y)).rgb;
+    vec3 d = texture(u_input, fpi.texCoord + vec2(x, -y)).rgb;
 
-    vec3 d = texture(u_input, vec2(fpi.texCoord.x - x, fpi.texCoord.y)).rgb;
-    vec3 e = texture(u_input, vec2(fpi.texCoord.x, fpi.texCoord.y)).rgb;
-    vec3 f = texture(u_input, vec2(fpi.texCoord.x + x, fpi.texCoord.y)).rgb;
-
-    vec3 g = texture(u_input, vec2(fpi.texCoord.x - x, fpi.texCoord.y - y)).rgb;
-    vec3 h = texture(u_input, vec2(fpi.texCoord.x, fpi.texCoord.y - y)).rgb;
-    vec3 i = texture(u_input, vec2(fpi.texCoord.x + x, fpi.texCoord.y - y)).rgb;
-
-    out_tex = (e*4.0 + (b+d+f+h)*2.0 + (a+c+g+i)) / 16.0;
+    out_tex = (a + b + c + d) * 0.25;
 }
diff --git a/share/shaders/camera_interface.glsl b/share/shaders/camera_interface.glsl
index ee00bc4fe..ecc3cc84f 100644
--- a/share/shaders/camera_interface.glsl
+++ b/share/shaders/camera_interface.glsl
@@ -1,4 +1,6 @@
-layout(std140, binding=1) uniform Camera {
+#include "bindings.glsl"
+
+layout(std140, binding=BINDING_UNIFORM_CAMERA) uniform Camera {
     mat4 projection;
     mat4 view;
     mat4 viewProjection;
diff --git a/share/shaders/composition.frag b/share/shaders/composition.frag
index b984dd419..d6fc22b0b 100644
--- a/share/shaders/composition.frag
+++ b/share/shaders/composition.frag
@@ -55,7 +55,7 @@ void main()
     #ifndef DOF
     finalColor *= texture(u_texture, uv).rgb;
     #else
-    finalColor *= do_dof(uv);
+    finalColor *= do_dof(uv, shadeDepth);
     #endif
     finalColor = mix(finalColor, vec3(texel_shade(shadeDepth)), whiteness);
 
diff --git a/share/shaders/csm_depth_only.vert b/share/shaders/csm_depth_only.vert
index 7fb7ffba3..028231c50 100644
--- a/share/shaders/csm_depth_only.vert
+++ b/share/shaders/csm_depth_only.vert
@@ -6,7 +6,11 @@ uniform mat4 u_mvp;
 void main()
 {
     #ifdef SKELETAL
-    gl_Position = u_mvp * boneTransform.m[int(a_boneIndex)] * vec4(a_position, 1);
+    gl_Position = mix(
+    u_mvp * boneTransform.m[int(a_boneIndex)] * vec4(a_position, 1),
+    u_mvp * nextBoneTransform.m[int(a_boneIndex)] * vec4(a_position, 1),
+    u_interTickFactor
+    );
     #else
     gl_Position = u_mvp * vec4(a_position, 1);
     #endif
diff --git a/share/shaders/csm_interface.glsl b/share/shaders/csm_interface.glsl
index ea2710820..22a5d4cc8 100644
--- a/share/shaders/csm_interface.glsl
+++ b/share/shaders/csm_interface.glsl
@@ -1,6 +1,8 @@
+#include "bindings.glsl"
+
 const int CSMSplits = 4;
 
-layout(std140, binding=2) uniform CSM {
+layout(std140, binding=BINDING_UNIFORM_CSM) uniform CSM {
     mat4 lightMVP[CSMSplits];
     vec3 lightDir;
 } csm;
diff --git a/share/shaders/depth_only.vert b/share/shaders/depth_only.vert
index 8c1176a46..68b5c2d1d 100644
--- a/share/shaders/depth_only.vert
+++ b/share/shaders/depth_only.vert
@@ -10,7 +10,11 @@ void main()
     gpi.color = a_color;
 
     #ifdef SKELETAL
-    vec4 vtx = camera.viewProjection * modelTransform.m * boneTransform.m[int(a_boneIndex)] * vec4(a_position, 1);
+    vec4 vtx = mix(
+    camera.viewProjection * modelTransform.m * boneTransform.m[int(a_boneIndex)] * vec4(a_position, 1),
+    camera.viewProjection * modelTransform.m * nextBoneTransform.m[int(a_boneIndex)] * vec4(a_position, 1),
+    u_interTickFactor
+    );
     #else
     vec4 vtx = camera.viewProjection * modelTransform.m * vec4(a_position, 1);
     #endif
diff --git a/share/shaders/dof.glsl b/share/shaders/dof.glsl
index c68533e3b..9ec433fb3 100644
--- a/share/shaders/dof.glsl
+++ b/share/shaders/dof.glsl
@@ -14,41 +14,35 @@ const float DofBlurRange = 3;
 
 vec2 dof_texel = 1.0 / vec2(textureSize(u_texture, 0));
 
-vec3 do_dof(in vec2 uv)
+vec3 do_dof(in vec2 uv, in float geomDepth)
 {
-    float depth = -texture(u_geometryPosition, uv).z * InvFarPlane;
+    float depth = geomDepth * InvFarPlane;
     float blur_amount = clamp((abs(depth-dof_focal_depth) - dof_start) / dof_dist, -DofBlurRange, DofBlurRange);
 
     const float NAmount = 0.001;//dither amount
     vec2 noise = noise2(uv) * NAmount * blur_amount;
 
-    const int Samples = 3;//samples on the first ring
-    const float BokehBias = 0.5;//bokeh edge bias
     vec2 blur_radius = dof_texel * blur_amount + noise;
 
     vec3 col = texture(u_texture, uv).rgb;
     float weight_sum = 1.0;
 
-    const int Rings = 3;
-    const float BokehDelta = 1.0 / Rings;
-    float bokehFactor = 0;
-    for (int i = 1; i <= Rings; ++i)
+    const vec2 samples[12] = vec2[](
+    vec2(1.000000, 0.000000), vec2(-0.500000, 0.866025), vec2(-0.500000, -0.866025),
+    vec2(2.000000, 0.000000), vec2(0.000000, 2.000000), vec2(-2.000000, 0.000000), vec2(0.000000, -2.000000),
+    vec2(3.000000, 0.000000), vec2(0.927051, 2.853170), vec2(-2.427051, 1.763356), vec2(-2.427051, -1.763356), vec2(0.927051, -2.853170)
+    );
+    const float sampleWeights[12] = float[](
+    0.500000, 0.500000, 0.500000,
+    0.666667, 0.666667, 0.666667, 0.666667,
+    0.833333, 0.833333, 0.833333, 0.833333, 0.833333
+    );
+
+    for (int i = 0; i < 12; ++i)
     {
-        int ringsamples = int(sqrt(i) * Samples);
-        float angleDelta = PI * 2.0 / float(ringsamples);
-
-        float angle = 0;
-        for (int j = 0; j < ringsamples; ++j)
-        {
-            vec2 dxy = vec2(cos(angle), sin(angle)) * float(i);
-            float weight = mix(1.0, bokehFactor, BokehBias);
-            vec2 sampleUv = dxy*blur_radius + uv;
-            col = texture(u_texture, sampleUv).rgb * weight + col;
-            weight_sum += weight;
-            angle += angleDelta;
-        }
-
-        bokehFactor += BokehDelta;
+        col += texture(u_texture, samples[i] * blur_radius + uv).rgb * sampleWeights[i];
+        weight_sum += sampleWeights[i];
     }
+
     return col / weight_sum;
 }
diff --git a/share/shaders/dust.frag b/share/shaders/dust.frag
index 435d29784..237a81940 100644
--- a/share/shaders/dust.frag
+++ b/share/shaders/dust.frag
@@ -1,5 +1,3 @@
-layout(early_fragment_tests) in;
-
 layout(location=0) out vec4 out_color;
 layout(location=0) uniform vec3 u_baseColor;
 
@@ -11,5 +9,9 @@ in DustFSInterface {
 
 void main()
 {
-    out_color = vec4(toLinear(u_baseColor)*fs.alpha, fs.alpha);
+    vec2 coord = gl_PointCoord - vec2(0.5);
+    if (dot(coord, coord) > 0.25) {
+        discard;
+    }
+    out_color = vec4(toLinear(u_baseColor) * fs.alpha, fs.alpha);
 }
diff --git a/share/shaders/dust.geom b/share/shaders/dust.geom
deleted file mode 100644
index 2289c3b06..000000000
--- a/share/shaders/dust.geom
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "transform_interface.glsl"
-#include "camera_interface.glsl"
-#include "constants.glsl"
-
-const int N = 12;
-
-layout (points) in;
-layout (triangle_strip, max_vertices = N) out;
-
-in DustVSInterface {
-    float alpha;
-    float size;
-} vs[];
-
-out DustFSInterface {
-    float alpha;
-} fs;
-
-const float ParticleRadius = 0.4;
-const float MaxSizeEnd = 2*1024;
-const float VanishEnd = 3*1024;
-
-void main()
-{
-    vec3 pos = gl_in[0].gl_Position.xyz;
-
-    mat4 v = camera.view;
-    mat4 mv = camera.view * modelTransform.m;
-
-    float distance = length(vec3(v * vec4(pos, 1.0)));
-    if (distance > VanishEnd) {
-        return;
-    }
-
-    float f = clamp(1-(distance-MaxSizeEnd)/(VanishEnd-MaxSizeEnd), 0, 1);
-
-    mat4 vp = camera.viewProjection;
-
-    float r = ParticleRadius * vs[0].size;
-    float alpha = vs[0].alpha;
-    for (int i=0; i<N/2; ++i) {
-        vec3 dx = vec3(mv[0].x, mv[1].x, mv[2].x) * r * cos(2*PI*(i+0.5)/N);
-        vec3 dy = vec3(mv[0].y, mv[1].y, mv[2].y) * r * sin(2*PI*(i+0.5)/N);
-
-        gl_Position = vp * vec4(pos + dx + dy, 1);
-        fs.alpha = alpha;
-        EmitVertex();
-
-        gl_Position = vp * vec4(pos + dx - dy, 1);
-        fs.alpha = alpha;
-        EmitVertex();
-    }
-    EndPrimitive();
-}
diff --git a/share/shaders/dust.vert b/share/shaders/dust.vert
index 09c16cb26..038a26bfb 100644
--- a/share/shaders/dust.vert
+++ b/share/shaders/dust.vert
@@ -2,33 +2,46 @@
 #include "transform_interface.glsl"
 #include "time_uniform.glsl"
 #include "noise.glsl"
+#include "camera_interface.glsl"
 
-out DustVSInterface {
+out DustFSInterface {
     float alpha;
-    float size;
-} vs;
+} fs;
 
+const float ParticleRadius = 0.4;
 const float MaxLifetime = 8;
 const float MaxDistance = 256;
 
 void main()
 {
-    vec3 n = snoise3(a_position.xyz);
-    vec3 n2 = snoise3(a_position.zxy);
+    vec3 basePos = a_position + vec3(modelTransform.m[3].xyz);
 
-    float randS = pow(0.5, 0.5 * n.y + 1) * pow(0.5, 1 - (0.5 * n.y + 1));
-    vs.size = 0.5 + randS*4;
+    vec3 n = snoise3(basePos * 0.0013 + 17.0);
+    vec3 n2 = snoise3(basePos.zxy * 0.0017 + 31.0);
+
+    float randS = pow(0.5, 0.5 * n.y + 1.0) * pow(0.5, 1.0 - (0.5 * n.y + 1.0));
+    float size = 0.5 + randS * 4.0;
 
     float particleMaxLifetime = (n2.x * 0.5 + 1.2) * MaxLifetime;
 
     float t = mod(TimeSeconds, particleMaxLifetime);
     float t0 = TimeSeconds - t;
-    vec3 pnoise = snoise3(a_position.xyz + vec3(t0*3, t0*2, t0));
-    vec3 normal = snoise3(a_position.zyx + pnoise);
-    float distance = snoise3(a_position.zyx - pnoise).x * MaxDistance;
+    vec3 pnoise = snoise3(basePos * 0.0021 + vec3(t0 * 0.3, t0 * 0.2, t0 * 0.1));
+    vec3 normal = snoise3(basePos.zyx * 0.0011 + pnoise);
+    float dist = snoise3(basePos.zyx * 0.0015 - pnoise).x * MaxDistance;
 
     float lifetime = t / particleMaxLifetime;
-    vs.alpha = clamp(min(lifetime, 1.0-lifetime) * 3.0, 0.0, 1.0) * 0.3;
-    vec3 pos = a_position + normal * distance * (t+pnoise.y) / particleMaxLifetime;
-    gl_Position = modelTransform.m * vec4(pos, 1);
+    fs.alpha = clamp(min(lifetime, 1.0 - lifetime) * 3.0, 0.0, 1.0) * 0.3;
+    vec3 pos = a_position + normal * dist * (t + pnoise.y) / particleMaxLifetime;
+
+    vec4 worldPos = modelTransform.m * vec4(pos, 1.0);
+    vec4 viewPos = camera.view * worldPos;
+
+    if (viewPos.z >= -camera.nearPlane) {
+        gl_Position = vec4(2.0, 2.0, 2.0, 1.0);
+        return;
+    }
+
+    gl_Position = camera.projection * viewPos;
+    gl_PointSize = (camera.viewport.y * camera.projection[1][1] * ParticleRadius * size) / gl_Position.w;
 }
diff --git a/share/shaders/fx_crt_v1.frag b/share/shaders/fx_crt_v1.frag
index 24916421b..298c2c13d 100644
--- a/share/shaders/fx_crt_v1.frag
+++ b/share/shaders/fx_crt_v1.frag
@@ -20,94 +20,63 @@ const float maskLight=1.5;
 
 //------------------------------------------------------------------------
 
-// Nearest emulated sample given floating point position and texel offset.
-// Also zero's off screen.
-vec3 Fetch(in ivec2 off, in vec2 res)
+// Allow nearest three lines to effect pixel.
+vec3 Tri(in vec2 res)
 {
-    return toLinear(texelFetch(u_input, ivec2(fpi.texCoord*res) + off, 0).rgb);
-}
+    vec2 st = fpi.texCoord * res;
+    ivec2 center = ivec2(st);
+    vec2 dst = -(st - floor(st) - 0.5);
 
-// Distance in emulated pixels to nearest texel.
-vec2 Dist(in vec2 res)
-{
-    vec2 st = fpi.texCoord*res;
-    return -(st - floor(st) - vec2(0.5));
-}
+    // Horizontal weights
+    float w0 = exp2(hardPix * (dst.x - 2.0) * (dst.x - 2.0));
+    float w1 = exp2(hardPix * (dst.x - 1.0) * (dst.x - 1.0));
+    float w2 = exp2(hardPix * (dst.x + 0.0) * (dst.x + 0.0));
+    float w3 = exp2(hardPix * (dst.x + 1.0) * (dst.x + 1.0));
+    float w4 = exp2(hardPix * (dst.x + 2.0) * (dst.x + 2.0));
 
-// 1D Gaussian.
-float Gaus(in float x, in float scale)
-{
-    return exp2(scale*x*x);
-}
+    float sum3 = 1.0 / (w1 + w2 + w3);
+    float sum5 = 1.0 / (w0 + w1 + w2 + w3 + w4);
 
-// 3-tap Gaussian filter along horz line.
-vec3 Horz3(in int off, in vec2 res)
-{
-    vec3 b=Fetch(ivec2(-1, off), res);
-    vec3 c=Fetch(ivec2(0, off), res);
-    vec3 d=Fetch(ivec2(1, off), res);
-    float dst=Dist(res).x;
-    // Convert distance to weight.
-    float wb=Gaus(dst-1.0, hardPix);
-    float wc=Gaus(dst+0.0, hardPix);
-    float wd=Gaus(dst+1.0, hardPix);
-    // Return filtered sample.
-    return (b*wb+c*wc+d*wd)/(wb+wc+wd);
-}
+    // Row -1
+    vec3 fetch_m1_m1 = toLinear(texelFetch(u_input, center + ivec2(-1, -1), 0).rgb);
+    vec3 fetch_0_m1  = toLinear(texelFetch(u_input, center + ivec2(0, -1), 0).rgb);
+    vec3 fetch_1_m1  = toLinear(texelFetch(u_input, center + ivec2(1, -1), 0).rgb);
+    vec3 a = (fetch_m1_m1 * w1 + fetch_0_m1 * w2 + fetch_1_m1 * w3) * sum3;
 
-// 5-tap Gaussian filter along horz line.
-vec3 Horz5(int off, in vec2 res)
-{
-    vec3 a=Fetch(ivec2(-2, off), res);
-    vec3 b=Fetch(ivec2(-1, off), res);
-    vec3 c=Fetch(ivec2(0, off), res);
-    vec3 d=Fetch(ivec2(1, off), res);
-    vec3 e=Fetch(ivec2(2, off), res);
-    float dst=Dist(res).x;
-    // Convert distance to weight.
-    float wa=Gaus(dst-2.0, hardPix);
-    float wb=Gaus(dst-1.0, hardPix);
-    float wc=Gaus(dst+0.0, hardPix);
-    float wd=Gaus(dst+1.0, hardPix);
-    float we=Gaus(dst+2.0, hardPix);
-    // Return filtered sample.
-    return (a*wa+b*wb+c*wc+d*wd+e*we)/(wa+wb+wc+wd+we);
-}
+    // Row 0
+    vec3 fetch_m2_0  = toLinear(texelFetch(u_input, center + ivec2(-2, 0), 0).rgb);
+    vec3 fetch_m1_0  = toLinear(texelFetch(u_input, center + ivec2(-1, 0), 0).rgb);
+    vec3 fetch_0_0   = toLinear(texelFetch(u_input, center + ivec2(0, 0), 0).rgb);
+    vec3 fetch_1_0   = toLinear(texelFetch(u_input, center + ivec2(1, 0), 0).rgb);
+    vec3 fetch_2_0   = toLinear(texelFetch(u_input, center + ivec2(2, 0), 0).rgb);
+    vec3 b = (fetch_m2_0 * w0 + fetch_m1_0 * w1 + fetch_0_0 * w2 + fetch_1_0 * w3 + fetch_2_0 * w4) * sum5;
 
-// Return scanline weight.
-float Scan(in float off, in vec2 res)
-{
-    return Gaus(Dist(res/4).y + off, hardScan);
-}
+    // Row 1
+    vec3 fetch_m1_1  = toLinear(texelFetch(u_input, center + ivec2(-1, 1), 0).rgb);
+    vec3 fetch_0_1   = toLinear(texelFetch(u_input, center + ivec2(0, 1), 0).rgb);
+    vec3 fetch_1_1   = toLinear(texelFetch(u_input, center + ivec2(1, 1), 0).rgb);
+    vec3 c = (fetch_m1_1 * w1 + fetch_0_1 * w2 + fetch_1_1 * w3) * sum3;
 
-// Allow nearest three lines to effect pixel.
-vec3 Tri(in vec2 res)
-{
-    vec3 a=Horz3(-1, res);
-    vec3 b=Horz5(0, res);
-    vec3 c=Horz3(1, res);
-    float wa=Scan(-1.0, res);
-    float wb=Scan(0.0, res);
-    float wc=Scan(1.0, res);
-    return a*wa+b*wb+c*wc;
+    // Scanline weights
+    vec2 st4 = st * 0.25;
+    float dst4y = -(st4.y - floor(st4.y) - 0.5);
+    float wa = exp2(hardScan * (dst4y - 1.0) * (dst4y - 1.0));
+    float wb = exp2(hardScan * (dst4y + 0.0) * (dst4y + 0.0));
+    float wc = exp2(hardScan * (dst4y + 1.0) * (dst4y + 1.0));
+
+    return a*wa + b*wb + c*wc;
 }
 
 // Shadow mask.
 vec3 Mask(in vec2 res)
 {
     vec2 pos = fpi.texCoord * res;
-    pos.x += pos.y*3.0;
-    vec3 mask = vec3(maskDark, maskDark, maskDark);
-    pos.x = fract(pos.x/6.0);
-    if (pos.x < 0.333) {
-        mask.r = maskLight;
-    }
-    else if (pos.x < 0.666) {
-        mask.g = maskLight;
-    }
-    else {
-        mask.b = maskLight;
-    }
+    pos.x += pos.y * 3.0;
+    float x = fract(pos.x / 6.0);
+    vec3 mask = vec3(maskDark);
+    if (x < 0.333) mask.r = maskLight;
+    else if (x < 0.666) mask.g = maskLight;
+    else mask.b = maskLight;
     return mask;
 }
 
diff --git a/share/shaders/fx_lens_distortion.frag b/share/shaders/fx_lens_distortion.frag
index 736b3c022..a4ca509ef 100644
--- a/share/shaders/fx_lens_distortion.frag
+++ b/share/shaders/fx_lens_distortion.frag
@@ -8,24 +8,27 @@ float absDistortionPower = abs(distortionPower);
 
 vec2 fisheye(in vec2 polar, in float stationary_radius)
 {
-    return normalize(polar) * tan(length(polar) * absDistortionPower) * stationary_radius / tan(stationary_radius * absDistortionPower);
+    float l = length(polar);
+    return polar * (tan(l * absDistortionPower) / (l * tan(stationary_radius * absDistortionPower))) * stationary_radius;
 }
 
 // same as fisheye, except that atan is used instead of tan
 vec2 anti_fisheye(in vec2 polar, in float stationary_radius)
 {
-    return normalize(polar) * atan(length(polar) * absDistortionPower) * stationary_radius / atan(stationary_radius * absDistortionPower);
+    float l = length(polar);
+    return polar * (atan(l * absDistortionPower) / (l * atan(stationary_radius * absDistortionPower))) * stationary_radius;
 }
 
 vec2 do_lens_distortion(in vec2 uv)
 {
     float stationary_radius = max(0.5, 0.5 / camera.aspectRatio);
+    vec2 polar = uv - vec2(0.5, 0.5);
 
     if (distortionPower > 0.0) {
-        return vec2(0.5, 0.5) + fisheye(uv - vec2(0.5, 0.5), stationary_radius);
+        return vec2(0.5, 0.5) + fisheye(polar, stationary_radius);
     }
     else if (distortionPower < 0.0) {
-        return vec2(0.5, 0.5) + anti_fisheye(uv - vec2(0.5, 0.5), stationary_radius);
+        return vec2(0.5, 0.5) + anti_fisheye(polar, stationary_radius);
     }
     else {
         return uv;
diff --git a/share/shaders/fx_underwater_movement.frag b/share/shaders/fx_underwater_movement.frag
index c74a94f06..60255bbdd 100644
--- a/share/shaders/fx_underwater_movement.frag
+++ b/share/shaders/fx_underwater_movement.frag
@@ -13,9 +13,7 @@ const float Amplitude2 = 0.0055;
 
 void do_water_distortion_frq(inout vec2 uv, in float timeMult, in float scale, in float amplitude)
 {
-    vec2 phase = uv * scale + vec2(u_time * timeMult);
-
-    uv += vec2(sin(phase.x), sin(phase.y)) * amplitude;
+    uv += sin(uv * scale + u_time * timeMult) * amplitude;
 }
 
 void do_water_distortion(inout vec2 uv)
diff --git a/share/shaders/geometry.frag b/share/shaders/geometry.frag
index 0563987b6..7dc94992a 100644
--- a/share/shaders/geometry.frag
+++ b/share/shaders/geometry.frag
@@ -37,7 +37,7 @@ vec4 barycentric(in vec4 wwww)
     for (i=0; i<4; ++i) {
         s1 = s[i];
         s2 = s[(i+1)%4];
-        A[i] = cross(vec3(s1, 0), vec3(s2, 0)).z;
+        A[i] = s1.x * s2.y - s1.y * s2.x;
         D[i] = dot(s1, s2);
     }
     vec4 t = (r.xyzw * r.yzwx - D) / A;
diff --git a/share/shaders/geometry.vert b/share/shaders/geometry.vert
index 627dedd72..17f99e61b 100644
--- a/share/shaders/geometry.vert
+++ b/share/shaders/geometry.vert
@@ -8,7 +8,7 @@
 void main()
 {
     #ifdef SKELETAL
-    mat4 mm = modelTransform.m * boneTransform.m[int(a_boneIndex)];
+    mat4 mm = modelTransform.m * (boneTransform.m[int(a_boneIndex)] * (1.0 - u_interTickFactor) + nextBoneTransform.m[int(a_boneIndex)] * u_interTickFactor);
     #elif SPRITEMODE == 3
     mat4 mm = a_modelMatrix;
     #else
@@ -50,10 +50,12 @@ void main()
     {
         #ifdef SKELETAL
         mat4 lmvp = csm.lightMVP[i] * boneTransform.m[int(a_boneIndex)];
+        mat4 lmvp2 = csm.lightMVP[i] * nextBoneTransform.m[int(a_boneIndex)];
+        vec4 tmp = mix(lmvp * pos, lmvp2 * pos, u_interTickFactor);
         #else
         mat4 lmvp = csm.lightMVP[i];
-        #endif
         vec4 tmp = lmvp * pos;
+        #endif
         gpi.vertexPosLight[i] = tmp.xyz * 0.5 + 0.5;
     }
 
diff --git a/share/shaders/hbao.frag b/share/shaders/hbao.frag
index 94f852cd3..648b913ba 100644
--- a/share/shaders/hbao.frag
+++ b/share/shaders/hbao.frag
@@ -42,21 +42,23 @@ void main()
         tangents[i] = stepSizes[i] * angleAxis(baseTangent, normal, i*DirRotation);
     }
 
+    vec4 P_fragPos = camera.projection * vec4(fragPos, 1.0);
     float occlusion = 0.0;
     for (int i = 0; i < Dirs; ++i)
     {
         vec3 tangent = tangents[i];
-        vec3 d = fragPos;
+        vec4 P_tangent = camera.projection * vec4(tangent, 0.0);
+        vec4 offset = P_fragPos;
         for (int j = 0; j < Steps; ++j)
         {
-            d += tangent;
-            vec4 offset = camera.projection * vec4(d, 1.0);
-            vec3 k = texture(u_position, (offset.xy / offset.w) * vec2(0.5) + vec2(0.5)).xyz;
+            offset += P_tangent;
+            vec3 k = texture(u_position, (offset.xy / offset.w) * 0.5 + 0.5).xyz;
             vec3 vk = k - fragPos;
-            float lvk = 1.0 / length(vk);
-            float w = min(Radius * lvk, 1);
-            occlusion += w * max(dot(vk, normal) * lvk - Bias, 0);
+            float lvk = inversesqrt(dot(vk, vk));
+            float w = min(Radius * lvk, 1.0);
+            occlusion += w * max(dot(vk, normal) * lvk - Bias, 0.0);
         }
     }
-    out_ao = pow(1 - occlusion / (Steps*Dirs), 1.5);
+    float s = 1.0 - occlusion / float(Steps * Dirs);
+    out_ao = s * sqrt(s);
 }
diff --git a/share/shaders/lighting.glsl b/share/shaders/lighting.glsl
index 11248204c..000452c18 100644
--- a/share/shaders/lighting.glsl
+++ b/share/shaders/lighting.glsl
@@ -1,8 +1,9 @@
 #include "csm_interface.glsl"
 #include "geometry_pipeline_interface.glsl"
 #include "util.glsl"
+#include "bindings.glsl"
 
-layout(std140, binding=5) uniform CSMVSM {
+layout(std140, binding=BINDING_UNIFORM_CSMVSM) uniform CSMVSM {
     uvec2 textures[CSMSplits];
 } csmVsm;
 
@@ -15,11 +16,11 @@ struct Light {
     float _pad[3];
 };
 
-layout(std430, binding=3) readonly restrict buffer b_lights {
+layout(std430, binding=BINDING_BUFFER_LIGHTS) readonly restrict buffer b_lights {
     Light lights[];
 };
 
-layout(std430, binding=4) readonly restrict buffer b_dynLights {
+layout(std430, binding=BINDING_BUFFER_DYN_LIGHTS) readonly restrict buffer b_dynLights {
     Light dynLights[];
 };
 
@@ -77,10 +78,11 @@ float shadow_map_multiplier()
     vec3 p;
     float result = 1.0;
 
-    for (splitIdx = CSMSplits-1; splitIdx>=0; --splitIdx) {
+    for (splitIdx = 0; splitIdx < CSMSplits; ++splitIdx) {
         p = gpi.vertexPosLight[splitIdx];
         if (all(greaterThanEqual(p.xy, vec2(0))) && all(lessThanEqual(p.xy, vec2(1)))) {
             result = calc_vsm_value(splitIdx, p);
+            break;
         }
     }
     return result;
@@ -89,11 +91,11 @@ float shadow_map_multiplier()
 float calc_light_strength(in vec3 pos, in float fadeDistance)
 {
     vec3 d = gpi.vertexPosWorld - pos;
-    float ld = length(d);
-    float r = ld / fadeDistance;
-    float result = 1.0 / (r*r + 1.0);
+    float distSq = dot(d, d);
+    float fadeDistSq = fadeDistance * fadeDistance;
+    float result = fadeDistSq / (distSq + fadeDistSq);
     #if SPRITEMODE == 0
-    return result * clamp(-dot(d/ld, gpi.vertexNormalWorld), 0.0, 1.0);
+    return result * clamp(-dot(d, gpi.vertexNormalWorld) * inversesqrt(distSq), 0.0, 1.0);
     #else
     return result;
     #endif
diff --git a/share/shaders/noise.glsl b/share/shaders/noise.glsl
index cf496371c..a4dd7b7a7 100644
--- a/share/shaders/noise.glsl
+++ b/share/shaders/noise.glsl
@@ -2,24 +2,29 @@ layout(bindless_sampler) uniform sampler2D u_noise;
 
 // noise functions return values in the range -1..1
 
-vec3 gauss_noise(vec2 p)
+vec3 noise_gaussian(vec2 p)
 {
-    vec3 a = texture(u_noise, p*2.1).xyz;
-    vec3 b = texture(u_noise, p*3.17 + vec2(.3, .9)*p.xx).xyz;
-    vec3 c = texture(u_noise, p*9.87 + vec2(.1, .7)*p.yy).xyz;
-    vec3 d = texture(u_noise, p*9.87 + vec2(.6, .2)*p.yx).xyz;
-    return (a+b+c+d) * 0.5 - vec3(1.0);
+    vec4 n1 = texture(u_noise, p * 2.1);
+    vec4 n2 = texture(u_noise, p * 3.17 + vec2(0.3, 0.9) * p.x);
+    vec4 n3 = texture(u_noise, p * 9.87 + vec2(0.1, 0.7) * p.y);
+
+    // Each component is a sum of 4 independent samples (Irwin-Hall distribution)
+    return vec3(
+    n1.r + n2.r + n3.r + n1.a,
+    n1.g + n2.g + n3.g + n2.a,
+    n1.b + n2.b + n3.b + n3.a
+    ) * 0.5 - 1.0;
 }
 
 vec3 basic_noise(vec2 p)
 {
-    vec3 a = texture(u_noise, p + vec2(58.3, 66.4)*p.yx).xyz;
-    return a * 2.0 - vec3(1.0);
+    vec2 st = p + vec2(58.3, 66.4) * p.yx;
+    return texture(u_noise, st).xyz * 2.0 - 1.0;
 }
 
 float noise(vec2 p)
 {
-    return gauss_noise(p).x;
+    return noise_gaussian(p).x;
 }
 
 float snoise(vec2 p)
@@ -29,7 +34,7 @@ float snoise(vec2 p)
 
 vec2 noise2(vec2 p)
 {
-    return gauss_noise(p).xy;
+    return noise_gaussian(p).xy;
 }
 
 vec3 snoise3(vec3 p)
diff --git a/share/shaders/transform_interface.glsl b/share/shaders/transform_interface.glsl
index c9e6dfa69..b9a7f95d2 100644
--- a/share/shaders/transform_interface.glsl
+++ b/share/shaders/transform_interface.glsl
@@ -1,9 +1,15 @@
-layout(std140, binding=0) uniform Transform {
+#include "bindings.glsl"
+
+layout(std140, binding=BINDING_UNIFORM_TRANSFORM) uniform Transform {
     mat4 m;
 } modelTransform;
 
 #ifdef SKELETAL
-layout(std140) readonly restrict buffer BoneTransform {
+uniform float u_interTickFactor;
+layout(std140, binding=BINDING_BUFFER_BONE_TRANSFORM) readonly restrict buffer BoneTransform {
     mat4 m[];
 } boneTransform;
+layout(std140, binding=BINDING_BUFFER_NEXT_BONE_TRANSFORM) readonly restrict buffer NextBoneTransform {
+    mat4 m[];
+} nextBoneTransform;
 #endif
diff --git a/share/shaders/util.glsl b/share/shaders/util.glsl
index d9b4dfdc2..922f8a04a 100644
--- a/share/shaders/util.glsl
+++ b/share/shaders/util.glsl
@@ -4,27 +4,22 @@
 float texel_shade(in float depth)
 {
     float s = clamp(1.0 - depth * InvFarPlane, 0.0, 1.0);
-    return pow(s, 1.5);
+    return s * sqrt(s);
 }
 
 // https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_texture_sRGB.txt
 float toSrgb(float cl)
 {
-    if (cl < 0.0031308) {
-        return 12.92 * cl;
-    }
-    else {
-        return 1.055 * pow(cl, 0.41666) - 0.055;
-    }
+    float s1 = 12.92 * cl;
+    float s2 = 1.055 * pow(cl, 0.41666) - 0.055;
+    return mix(s2, s1, step(cl, 0.0031308));
 }
 
 vec3 toSrgb(vec3 cl)
 {
-    return vec3(
-    toSrgb(cl.r),
-    toSrgb(cl.g),
-    toSrgb(cl.b)
-    );
+    vec3 s1 = 12.92 * cl;
+    vec3 s2 = 1.055 * pow(cl, vec3(0.41666)) - 0.055;
+    return mix(s2, s1, step(cl, vec3(0.0031308)));
 }
 
 vec4 toSrgb(vec4 cl)
@@ -35,20 +30,15 @@ vec4 toSrgb(vec4 cl)
 // https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_texture_sRGB_decode.txt
 float toLinear(float cs)
 {
-    if (cs <= 0.04045) {
-        return cs / 12.92;
-    }
-    else {
-        return pow(((cs + 0.055)/1.055), 2.4);
-    }
+    float l1 = cs / 12.92;
+    float l2 = pow((cs + 0.055) / 1.055, 2.4);
+    return mix(l2, l1, step(cs, 0.04045));
 }
 
 vec3 toLinear(vec3 cs) {
-    return vec3(
-    toLinear(cs.r),
-    toLinear(cs.g),
-    toLinear(cs.b)
-    );
+    vec3 l1 = cs / 12.92;
+    vec3 l2 = pow((cs + 0.055) / 1.055, vec3(2.4));
+    return mix(l2, l1, step(cs, vec3(0.04045)));
 }
 
 vec4 toLinear(vec4 cs)
diff --git a/share/shaders/water_caustics.glsl b/share/shaders/water_caustics.glsl
index fa9af78c1..0ad770758 100644
--- a/share/shaders/water_caustics.glsl
+++ b/share/shaders/water_caustics.glsl
@@ -8,22 +8,18 @@ float voronoi(in vec3 p)
 
     const float Offset = 0.5;
     float m_dist = 1.0 - Offset;
-    vec3 time = vec3(TimeSeconds * 5);
+    float time_val = TimeSeconds * 5.0;
 
-    for (float fy = -1; fy <= 1; fy += 1.0) {
-        for (float fx = -1; fx <= 1; fx += 1.0) {
-            for (float fz = -1; fz <= 1; fz += 1.0) {
-                vec3 neighbor = vec3(fx, fy, fz);
-                // Random position from current + neighbor place in the grid
-                vec3 point = snoise3(i_st + neighbor);
-
-                // Animate the point
-                point = sin(point*6.2831 + time) * 0.5 + 0.5;
+    vec3 start = step(0.5, f_st) - 1.0;
 
-                // Vector between the sample and the point
+    for (int y = 0; y <= 1; y++) {
+        for (int x = 0; x <= 1; x++) {
+            for (int z = 0; z <= 1; z++) {
+                vec3 neighbor = start + vec3(float(x), float(y), float(z));
+                vec3 point = snoise3(i_st + neighbor);
+                point = sin(point * 6.2831853 + time_val) * 0.5 + 0.5;
                 vec3 diff = neighbor + point - f_st;
-                float dist = dot(diff, diff);
-                m_dist = min(m_dist, dist);
+                m_dist = min(m_dist, dot(diff, diff));
             }
         }
     }
diff --git a/share/shaders/water_surface.frag b/share/shaders/water_surface.frag
index 735b6b7f0..ebd046344 100644
--- a/share/shaders/water_surface.frag
+++ b/share/shaders/water_surface.frag
@@ -11,9 +11,6 @@ layout(location=1) out float out_position;
 #define ROT_2D(a) \
     mat2(cos(a), -sin(a), sin(a), cos(a))
 
-float fbm(in vec2 st) {
-    return 0.25 * noise(st * 0.0064) + 0.5;
-}
 
 const float TimeMult = 0.0002;
 const float TexScale = 2048;
@@ -24,25 +21,24 @@ float bumpTex(in vec2 uv, in float time) {
     vec2 coords1 = rot1 * uv + time*vec2(0.1, -0.3)*TimeMult;
     vec2 coords2 = rot2 * uv - time*vec2(0.1, 0.2)*TimeMult;
 
-    float wave1 = fbm(coords1*vec2(30.0, 20.0)) * 0.5;
-    float wave2 = fbm(coords2*vec2(30.0, 20.0)) * 0.5;
-    float x = wave1 + wave2;
+    const vec2 scale = vec2(30.0, 20.0) * 0.0064;
+    float n1 = noise(coords1 * scale);
+    float n2 = noise(coords2 * scale);
+    float x = 0.125 * (n1 + n2) + 0.5;
     return x*x;
 }
 
-
 float bumpFunc(in vec2 st, in float time){
     return bumpTex(st + vec2(bumpTex(st, time)*0.11, 0), time);
 }
 
 vec2 bumpMap(in vec2 st, in float time){
-    const float eps = 2./TexScale;
-    vec2 ff = vec2(
-    bumpFunc(st-vec2(eps, 0), time),
-    bumpFunc(st-vec2(0, eps), time)
-    );
+    const float eps = 2.0 / TexScale;
+    float f0 = bumpFunc(st, time);
+    float fx = bumpFunc(st - vec2(eps, 0), time);
+    float fy = bumpFunc(st - vec2(0, eps), time);
 
-    return (ff-vec2(bumpFunc(st, time)))/eps*0.13;
+    return (vec2(fx, fy) - f0) / eps * 0.13;
 }
 
 void main()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1741dab70..126e39d20 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -110,6 +110,8 @@ add_library(
         serialization/serialization.h
         serialization/serialization.cpp
         serialization/serialization_fwd.h
+        serialization/access.h
+        serialization/concepts.h
         serialization/skeletalmodeltype_ptr.h
         serialization/unordered_map.h
         serialization/unordered_set.h
@@ -231,6 +233,8 @@ set( CROFTENGINE_SRCS
         engine/heightinfo.cpp
         engine/inventory.h
         engine/inventory.cpp
+        engine/levelloop.h
+        engine/levelloop.cpp
         engine/lighting.h
         engine/lighting.cpp
         engine/location.h
@@ -436,6 +440,8 @@ set( CROFTENGINE_SRCS
         engine/objects/modelobject.h
         engine/objects/motorboat.cpp
         engine/objects/motorboat.h
+        engine/objects/matrixstack.cpp
+        engine/objects/matrixstack.h
         engine/objects/mummy.cpp
         engine/objects/mummy.h
         engine/objects/mutant.cpp
@@ -465,6 +471,8 @@ set( CROFTENGINE_SRCS
         engine/objects/scionpiece.h
         engine/objects/shatter.cpp
         engine/objects/shatter.h
+        engine/objects/segmentinterpolationmatrixstack.cpp
+        engine/objects/segmentinterpolationmatrixstack.h
         engine/objects/skateboardkid.cpp
         engine/objects/skateboardkid.h
         engine/objects/slammingdoors.cpp
@@ -526,6 +534,8 @@ set( CROFTENGINE_SRCS
         render/portaltracer.cpp
         render/renderpipeline.h
         render/renderpipeline.cpp
+        render/rendersystem.h
+        render/rendersystem.cpp
         render/rendersettings.h
         render/rendersettings.cpp
         render/textureanimator.h
@@ -574,8 +584,8 @@ set( CROFTENGINE_SRCS
         render/scene/node.cpp
         render/scene/renderable.h
         render/scene/rendercontext.h
-        render/scene/renderer.h
-        render/scene/renderer.cpp
+        render/scene/scenegraph.h
+        render/scene/scenegraph.cpp
         render/scene/screenoverlay.h
         render/scene/screenoverlay.cpp
         render/scene/sprite.h
@@ -735,6 +745,7 @@ add_subdirectory( archive )
 add_subdirectory( launcher )
 add_subdirectory( dosbox-cdrom )
 add_subdirectory( network )
+add_subdirectory( serialization )
 
 if( WIN32 )
     set( WIN32_SPECIFIC_LIBS dbghelp )
diff --git a/src/archive/readonlyarchive.cpp b/src/archive/readonlyarchive.cpp
index f9d39f125..51270ce3b 100644
--- a/src/archive/readonlyarchive.cpp
+++ b/src/archive/readonlyarchive.cpp
@@ -6,7 +6,7 @@
 #include <boost/throw_exception.hpp>
 #include <filesystem>
 #include <fstream>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iosfwd>
 #include <optional>
 #include <stdexcept>
@@ -100,4 +100,4 @@ ReadOnlyArchive::EntryType ReadOnlyArchive::getType()
   default:
     return EntryType::Other;
   }
-}
+}
\ No newline at end of file
diff --git a/src/archive/readonlyarchive.h b/src/archive/readonlyarchive.h
index f408a7619..4e7a31ca1 100644
--- a/src/archive/readonlyarchive.h
+++ b/src/archive/readonlyarchive.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <optional>
 #include <string>
 
@@ -40,6 +40,6 @@ class ReadOnlyArchive final
 
 private:
   bool m_failure = true;
-  gsl::not_null<archive*> m_archive;
+  gsl_lite::not_null<archive*> m_archive;
   archive_entry* m_entry = nullptr;
-};
+};
\ No newline at end of file
diff --git a/src/archive/writeonlyxzarchive.cpp b/src/archive/writeonlyxzarchive.cpp
index 696d166cb..930372056 100644
--- a/src/archive/writeonlyxzarchive.cpp
+++ b/src/archive/writeonlyxzarchive.cpp
@@ -4,7 +4,7 @@
 #include <archive_entry.h>
 #include <filesystem>
 #include <fstream>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 #include <string>
 #include <vector>
@@ -26,14 +26,14 @@ WriteOnlyXzArchive::~WriteOnlyXzArchive()
 
 void WriteOnlyXzArchive::addFile(const std::filesystem::path& srcPath, const std::filesystem::path& archivePath)
 {
-  gsl::not_null entry{archive_entry_new()};
-  const auto freeEntry = gsl::finally(
-    [&entry]()
+  gsl_lite::not_null entry{archive_entry_new()};
+  const auto freeEntry = gsl_lite::finally(
+    [&entry]
     {
       archive_entry_free(entry.get());
     });
   archive_entry_copy_pathname(entry, archivePath.filename().string().c_str());
-  archive_entry_set_size(entry, gsl::narrow<la_int64_t>(std::filesystem::file_size(srcPath)));
+  archive_entry_set_size(entry, gsl_lite::narrow<la_int64_t>(std::filesystem::file_size(srcPath)));
   archive_entry_set_filetype(entry, AE_IFREG);
   archive_entry_set_perm(entry, 0644);
   gsl_Assert(archive_write_header(m_archive.get(), entry) == ARCHIVE_OK);
@@ -42,9 +42,8 @@ void WriteOnlyXzArchive::addFile(const std::filesystem::path& srcPath, const std
   buffer.resize(1024);
   std::ifstream f{srcPath, std::ios::in | std::ios::binary};
   gsl_Assert(f.is_open());
-  while(f.read(buffer.data(), gsl::narrow<std::streamsize>(buffer.size())).gcount() > 0)
+  while(f.read(buffer.data(), gsl_lite::narrow<std::streamsize>(buffer.size())).gcount() > 0)
   {
-    ;
     gsl_Assert(archive_write_data(m_archive.get(), buffer.data(), f.gcount()) == f.gcount());
   }
 }
diff --git a/src/archive/writeonlyxzarchive.h b/src/archive/writeonlyxzarchive.h
index f9892df59..87f8bf6cb 100644
--- a/src/archive/writeonlyxzarchive.h
+++ b/src/archive/writeonlyxzarchive.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 struct archive;
 
@@ -15,5 +15,5 @@ class WriteOnlyXzArchive final
   void addFile(const std::filesystem::path& srcPath, const std::filesystem::path& archivePath);
 
 private:
-  gsl::not_null<archive*> m_archive;
-};
+  gsl_lite::not_null<archive*> m_archive;
+};
\ No newline at end of file
diff --git a/src/audio/audiostreamdecoder.cpp b/src/audio/audiostreamdecoder.cpp
index c23bca287..f3c584c48 100644
--- a/src/audio/audiostreamdecoder.cpp
+++ b/src/audio/audiostreamdecoder.cpp
@@ -12,7 +12,7 @@
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <memory>
 #include <mutex>
@@ -37,7 +37,7 @@ namespace audio
 {
 namespace
 {
-std::string getAvError(int err)
+std::string getAvError(const int err)
 {
   std::vector<char> tmp(1024, 0);
   if(av_strerror(err, tmp.data(), tmp.size()) < 0)
@@ -46,7 +46,7 @@ std::string getAvError(int err)
   return tmp.data();
 }
 
-void handleSendPacketError(int err, AVCodecContext* ctx)
+void handleSendPacketError(const int err, AVCodecContext* ctx)
 {
   if(err == AVERROR(EINVAL))
   {
@@ -63,7 +63,7 @@ void handleSendPacketError(int err, AVCodecContext* ctx)
     case AVERROR(ENOMEM):
       BOOST_LOG_TRIVIAL(error) << "Failed to add packet to audio decoder queue";
       break;
-      // NOLINTNEXTLINE(hicpp-signed-bitwise)
+    // NOLINTNEXTLINE(hicpp-signed-bitwise)
     case AVERROR_EOF:
       BOOST_LOG_TRIVIAL(error) << "Audio decoder already flushed";
       break;
@@ -97,7 +97,7 @@ AudioStreamDecoder::AudioStreamDecoder(AVFormatContext* fmtContext, bool rplFake
 #if LIBAVUTIL_VERSION_MAJOR >= 58
   gsl_Expects(m_stream->context->ch_layout.nb_channels == 1 || m_stream->context->ch_layout.nb_channels == 2);
 
-  auto channelLayout = m_stream->context->ch_layout.nb_channels == 1 ? AVChannelLayout AV_CHANNEL_LAYOUT_MONO
+  const auto channelLayout = m_stream->context->ch_layout.nb_channels == 1 ? AVChannelLayout AV_CHANNEL_LAYOUT_MONO
                                                                      : AVChannelLayout AV_CHANNEL_LAYOUT_STEREO;
   gsl_Assert(swr_alloc_set_opts2(&m_swrContext,
                                  &channelLayout,
@@ -152,7 +152,7 @@ bool AudioStreamDecoder::push(const AVPacket& packet)
       BOOST_THROW_EXCEPTION(std::runtime_error("Failed to receive resampled audio data"));
     }
 
-    std::vector<int16_t> audio(gsl::narrow_cast<size_t>(outSamples * getChannels()), 0);
+    std::vector<int16_t> audio(gsl_lite::narrow_cast<size_t>(outSamples * getChannels()), 0);
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
     auto* audioData = reinterpret_cast<uint8_t*>(audio.data());
 
@@ -168,7 +168,7 @@ bool AudioStreamDecoder::push(const AVPacket& packet)
     }
 
     // cppcheck-suppress invalidFunctionArg
-    audio.resize(gsl::narrow_cast<size_t>(framesDecoded * getChannels()));
+    audio.resize(gsl_lite::narrow_cast<size_t>(framesDecoded * getChannels()));
 
     m_queue.push(std::move(audio));
   }
@@ -225,8 +225,8 @@ std::chrono::milliseconds AudioStreamDecoder::getPosition() const
 void AudioStreamDecoder::seek(const std::chrono::milliseconds& position)
 {
   const std::unique_lock lock{m_mutex};
-  const auto ts = ffmpeg::fromDuration(position, m_stream->stream->time_base);
-  if(av_seek_frame(m_fmtContext, m_stream->index, ts, 0) < 0)
+  if(const auto ts = ffmpeg::fromDuration(position, m_stream->stream->time_base);
+     av_seek_frame(m_fmtContext, m_stream->index, ts, 0) < 0)
   {
     BOOST_LOG_TRIVIAL(warning) << "failed to seek audio stream to " << position.count() << "ms";
   }
@@ -241,4 +241,4 @@ int AudioStreamDecoder::getChannels() const noexcept
   return m_stream->context->channels;
 #endif
 }
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/audiostreamdecoder.h b/src/audio/audiostreamdecoder.h
index 11bd9baaf..ab7fe2fb2 100644
--- a/src/audio/audiostreamdecoder.h
+++ b/src/audio/audiostreamdecoder.h
@@ -53,7 +53,7 @@ class AudioStreamDecoder final
 
   void seek(const std::chrono::milliseconds& position);
 
-  [[nodiscard]] audio::Clock::duration getDuration() const;
+  [[nodiscard]] Clock::duration getDuration() const;
 
   [[nodiscard]] int getChannels() const noexcept;
 
diff --git a/src/audio/bufferhandle.cpp b/src/audio/bufferhandle.cpp
index 5dfb6e9cd..6e255a6f9 100644
--- a/src/audio/bufferhandle.cpp
+++ b/src/audio/bufferhandle.cpp
@@ -6,7 +6,7 @@
 #include <AL/al.h>
 #include <cstdint>
 #include <cstring>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <memory>
 #include <vector>
@@ -23,7 +23,7 @@ void BufferHandle::fill(const int16_t* samples, const size_t frameCount, const i
   AL_ASSERT(alBufferData(*this,
                          channels == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16,
                          samples,
-                         gsl::narrow<ALsizei>(frameCount * sizeof(samples[0]) * channels),
+                         gsl_lite::narrow<ALsizei>(frameCount * sizeof(samples[0]) * channels),
                          sampleRate));
 }
 
@@ -36,8 +36,8 @@ void BufferHandle::fillFromWav(const uint8_t* data)
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
   uint32_t dataSize = 0;
   std::memcpy(&dataSize, data + 4, sizeof(uint32_t));
-  auto tmp = std::make_unique<FfmpegMemoryStreamSource>(
-    gsl::span{data, gsl::narrow_cast<gsl::span<uint8_t>::index_type>(dataSize) + 8});
+  const auto tmp = std::make_unique<FfmpegMemoryStreamSource>(
+    gsl_lite::span{data, gsl_lite::narrow_cast<gsl_lite::span<uint8_t>::index_type>(dataSize) + 8});
 
   static constexpr size_t ChunkSize = 8192;
   std::vector<int16_t> pcm;
@@ -45,16 +45,15 @@ void BufferHandle::fillFromWav(const uint8_t* data)
   {
     const auto offset = pcm.size();
     pcm.resize(pcm.size() + tmp->getChannels() * ChunkSize);
-    const auto read = tmp->read(&pcm[offset], ChunkSize, false);
-    if(read != ChunkSize)
+    if(const auto read = tmp->read(&pcm[offset], ChunkSize, false); read != ChunkSize)
     {
-      pcm.erase(
-        std::next(pcm.begin(), gsl::narrow<std::vector<int16_t>::difference_type>(offset + tmp->getChannels() * read)),
-        pcm.end());
+      pcm.erase(std::next(pcm.begin(),
+                          gsl_lite::narrow<std::vector<int16_t>::difference_type>(offset + tmp->getChannels() * read)),
+                pcm.end());
       break;
     }
   }
 
   fill(pcm.data(), pcm.size() / tmp->getChannels(), tmp->getChannels(), tmp->getSampleRate());
 }
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/bufferhandle.h b/src/audio/bufferhandle.h
index 8da7b5c2c..b24b08d13 100644
--- a/src/audio/bufferhandle.h
+++ b/src/audio/bufferhandle.h
@@ -22,8 +22,7 @@ class BufferHandle : public Handle
 
   [[nodiscard]] Clock::duration getDuration() const noexcept
   {
-    return Clock::duration((m_frameCount * Clock::duration::period::den)
-                           / (m_sampleRate * Clock::duration::period::num));
+    return Clock::duration(m_frameCount * Clock::duration::period::den / (m_sampleRate * Clock::duration::period::num));
   }
 
 private:
diff --git a/src/audio/buffervoice.cpp b/src/audio/buffervoice.cpp
index 63fb1d7e6..5beae7d05 100644
--- a/src/audio/buffervoice.cpp
+++ b/src/audio/buffervoice.cpp
@@ -7,7 +7,7 @@
 #include "voice.h"
 
 #include <AL/al.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <utility>
@@ -37,4 +37,4 @@ Clock::duration BufferVoice::getDuration() const
 {
   return m_buffer->getDuration();
 }
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/buffervoice.h b/src/audio/buffervoice.h
index e7c594258..3f342d70e 100644
--- a/src/audio/buffervoice.h
+++ b/src/audio/buffervoice.h
@@ -13,7 +13,6 @@ class SourceHandle;
 
 class BufferVoice final : public Voice
 {
-private:
   gslu::nn_shared<BufferHandle> m_buffer;
 
 public:
diff --git a/src/audio/device.cpp b/src/audio/device.cpp
index aee0f05ee..0d77af74d 100644
--- a/src/audio/device.cpp
+++ b/src/audio/device.cpp
@@ -18,7 +18,7 @@
 #include <cstddef>
 #include <functional>
 #include <glm/glm.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <mutex>
@@ -47,14 +47,14 @@ namespace audio
 {
 namespace
 {
-const std::array<ALCint, 5> deviceQueryParamList{// reserve additional 2 sources for audio tracks
-                                                 ALC_STEREO_SOURCES,
-                                                 Device::SourceHandleSlots + 2,
-                                                 ALC_SYNC,
-                                                 ALC_FALSE,
-                                                 ALC_INVALID};
-
-void logDeviceInfo(const gsl::not_null<ALCdevice*>& device)
+constexpr std::array<ALCint, 5> deviceQueryParamList{// reserve additional 2 sources for audio tracks
+                                                     ALC_STEREO_SOURCES,
+                                                     Device::SourceHandleSlots + 2,
+                                                     ALC_SYNC,
+                                                     ALC_FALSE,
+                                                     ALC_INVALID};
+
+void logDeviceInfo(const gsl_lite::not_null<ALCdevice*>& device)
 {
   BOOST_LOG_TRIVIAL(info) << "OpenAL device: " << alcGetString(device, ALC_ALL_DEVICES_SPECIFIER);
   BOOST_LOG_TRIVIAL(info) << "OpenAL version: " << AL_ASSERT_FN(alGetString(AL_VERSION));
@@ -159,9 +159,9 @@ Device::Device()
   AL_ASSERT(alListenerf(AL_METERS_PER_UNIT, 1 / 512.0f));
   AL_ASSERT(alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED));
 
-  loadALExtFunctions(gsl::not_null{m_device});
+  loadALExtFunctions(gsl_lite::not_null{m_device});
 
-  logDeviceInfo(gsl::not_null{m_device});
+  logDeviceInfo(gsl_lite::not_null{m_device});
 
   ALC_ASSERT(m_device, alcGetIntegerv(m_device, ALC_FREQUENCY, 1, &m_frq));
 
@@ -171,7 +171,7 @@ Device::Device()
   AL_ASSERT(alFilterf(*m_underwaterFilter, AL_LOWPASS_GAIN, 0.7f));   // Low frequencies gain.
   AL_ASSERT(alFilterf(*m_underwaterFilter, AL_LOWPASS_GAINHF, 0.1f)); // High frequencies gain.
 
-  m_streamUpdater = std::thread{[this]()
+  m_streamUpdater = std::thread{[this]
                                 {
                                   while(!this->m_shutdown)
                                   {
@@ -213,33 +213,31 @@ void Device::update()
   // remove expired streams and voices
   {
     const std::lock_guard lock{m_streamsLock};
-    auto streams = std::move(m_streams);
-    for(const auto& stream : streams)
+    for(const auto streams = std::move(m_streams); const auto& stream : streams)
     {
       if(!stream->done())
         m_streams.emplace(stream);
     }
   }
-  m_allVoices.erase(std::remove_if(m_allVoices.begin(),
-                                   m_allVoices.end(),
-                                   [](const auto& v)
-                                   {
-                                     return v->done();
-                                   }),
-                    m_allVoices.end());
+  std::erase_if(m_allVoices,
+                [](const auto& v)
+                {
+                  return v->done();
+                });
 
   // order voices by non-positional, then by distance
   glm::vec3 listenerPos;
   AL_ASSERT(alGetListener3f(AL_POSITION, &listenerPos.x, &listenerPos.y, &listenerPos.z));
-  std::stable_sort(m_allVoices.begin(),
-                   m_allVoices.end(),
-                   [&listenerPos](const auto& a, const auto& b)
-                   {
-                     // non-positional voices have the highest priority
-                     const auto aDist = a->isPositional() ? glm::distance(listenerPos, *a->getPosition()) : 0.0f;
-                     const auto bDist = b->isPositional() ? glm::distance(listenerPos, *b->getPosition()) : 0.0f;
-                     return aDist < bDist;
-                   });
+  std::ranges::stable_sort(m_allVoices,
+                           [&listenerPos](const auto& a, const auto& b)
+                           {
+                             // non-positional voices have the highest priority
+                             const auto aDist
+                               = a->isPositional() ? glm::distance(listenerPos, *a->getPosition()) : 0.0f;
+                             const auto bDist
+                               = b->isPositional() ? glm::distance(listenerPos, *b->getPosition()) : 0.0f;
+                             return aDist < bDist;
+                           });
 
   size_t vi = 0;
   for(const auto& voice : m_allVoices)
@@ -269,7 +267,7 @@ gslu::nn_shared<StreamVoice> Device::createStream(std::unique_ptr<AbstractStream
                                                   const size_t bufferCount,
                                                   const std::chrono::milliseconds& initialPosition)
 {
-  auto stream = gsl::make_shared<StreamVoice>(
+  auto stream = gsl_lite::make_shared<StreamVoice>(
     std::make_unique<StreamingSourceHandle>(), std::move(src), bufferSize, bufferCount, initialPosition);
 
   const std::lock_guard lock{m_streamsLock};
@@ -282,8 +280,7 @@ void Device::updateStreams()
   const std::lock_guard lock{m_streamsLock};
   for(const auto& stream : m_streams)
     stream->update();
-  auto tmp = std::move(m_updateCallbacks);
-  for(auto& [fn, t] : tmp)
+  for(auto tmp = std::move(m_updateCallbacks); auto& [fn, t] : tmp)
   {
     if(fn(std::chrono::high_resolution_clock::now() - t))
     {
@@ -305,12 +302,12 @@ void Device::setListenerTransform(const glm::vec3& pos, const glm::vec3& front,
 {
   AL_ASSERT(alListener3f(AL_POSITION, pos.x, pos.y, pos.z));
 
-  const std::array<ALfloat, 6> o{front.x, front.y, front.z, up.x, up.y, up.z};
+  const std::array o{front.x, front.y, front.z, up.x, up.y, up.z};
   AL_ASSERT(alListenerfv(AL_ORIENTATION, o.data()));
 }
 
 // NOLINTNEXTLINE(readability-make-member-function-const, readability-convert-member-functions-to-static)
-void Device::setListenerGain(float gain)
+void Device::setListenerGain(const float gain)
 {
   gsl_Expects(gain >= 0);
   AL_ASSERT(alListenerf(AL_GAIN, gain));
@@ -321,4 +318,4 @@ void Device::registerUpdateCallback(const std::function<UpdateCallback>& fn)
   const std::lock_guard lock{m_streamsLock};
   m_updateCallbacks.emplace_back(fn, std::chrono::high_resolution_clock::now());
 }
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/device.h b/src/audio/device.h
index e3abd3e79..977362eb1 100644
--- a/src/audio/device.h
+++ b/src/audio/device.h
@@ -5,7 +5,7 @@
 #include <cstddef>
 #include <functional>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <mutex>
@@ -44,10 +44,11 @@ class Device final
   }
 
   void removeStream(const gslu::nn_shared<StreamVoice>& stream);
+
   void removeStream(const std::weak_ptr<StreamVoice>& stream)
   {
     if(const auto locked = stream.lock())
-      removeStream(gsl::not_null{locked});
+      removeStream(gsl_lite::not_null{locked});
   }
 
   void setListenerTransform(const glm::vec3& pos, const glm::vec3& front, const glm::vec3& up);
@@ -94,4 +95,4 @@ class Device final
 
   void updateStreams();
 };
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/emitter.cpp b/src/audio/emitter.cpp
index a248ccf5b..1ec97752f 100644
--- a/src/audio/emitter.cpp
+++ b/src/audio/emitter.cpp
@@ -2,7 +2,7 @@
 
 #include "soundengine.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <unordered_set>
 #include <utility>
 
@@ -17,7 +17,7 @@ Emitter::~Emitter()
   }
 }
 
-Emitter::Emitter(const gsl::not_null<SoundEngine*>& engine)
+Emitter::Emitter(const gsl_lite::not_null<SoundEngine*>& engine)
     : m_engine{engine}
 {
   m_engine->m_emitters.emplace(this);
@@ -52,4 +52,4 @@ Emitter& Emitter::operator=(Emitter&& rhs) noexcept
   m_engine->m_emitters.emplace(this);
   return *this;
 }
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/emitter.h b/src/audio/emitter.h
index f5da6da98..74df7f3a3 100644
--- a/src/audio/emitter.h
+++ b/src/audio/emitter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace audio
 {
@@ -12,11 +12,11 @@ class Emitter
   friend class SoundEngine;
 
 public:
-  explicit Emitter(const gsl::not_null<SoundEngine*>& engine);
+  explicit Emitter(const gsl_lite::not_null<SoundEngine*>& engine);
   virtual ~Emitter();
 
   Emitter(const Emitter& rhs)
-      : Emitter{gsl::not_null{rhs.m_engine}}
+      : Emitter{gsl_lite::not_null{rhs.m_engine}}
   {
   }
 
@@ -30,4 +30,4 @@ class Emitter
 private:
   mutable SoundEngine* m_engine = nullptr;
 };
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/fadevolumecallback.h b/src/audio/fadevolumecallback.h
index 77f5de45a..66093280e 100644
--- a/src/audio/fadevolumecallback.h
+++ b/src/audio/fadevolumecallback.h
@@ -16,7 +16,7 @@ class FadeVolumeCallback final
 public:
   using FinalCallback = std::function<void()>;
 
-  explicit FadeVolumeCallback(ALfloat to,
+  explicit FadeVolumeCallback(const ALfloat to,
                               const std::chrono::high_resolution_clock::duration& duration,
                               const gslu::nn_shared<Voice>& voice,
                               FinalCallback finalCallback)
@@ -28,9 +28,9 @@ class FadeVolumeCallback final
   {
   }
 
-  bool operator()(const std::chrono::high_resolution_clock::duration& t)
+  bool operator()(const std::chrono::high_resolution_clock::duration& t) const
   {
-    auto voice = m_voice.lock();
+    const auto voice = m_voice.lock();
     if(voice == nullptr)
     {
       if(static_cast<bool>(m_finalCallback))
diff --git a/src/audio/ffmpegstreamsource.cpp b/src/audio/ffmpegstreamsource.cpp
index a8a4e8ce8..1e931f923 100644
--- a/src/audio/ffmpegstreamsource.cpp
+++ b/src/audio/ffmpegstreamsource.cpp
@@ -9,7 +9,7 @@
 #include <cstdint>
 #include <cstdio>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 #include <istream>
 #include <memory>
@@ -31,7 +31,7 @@ namespace audio
 {
 namespace
 {
-std::string getAvError(int err)
+std::string getAvError(const int err)
 {
   std::vector<char> tmp(1024, 0);
   if(av_strerror(err, tmp.data(), tmp.size()) < 0)
@@ -41,7 +41,7 @@ std::string getAvError(int err)
 }
 } // namespace
 
-BasicFfmpegStreamSource::BasicFfmpegStreamSource(AVFormatContext* fmtContext, const gsl::czstring& streamName)
+BasicFfmpegStreamSource::BasicFfmpegStreamSource(AVFormatContext* fmtContext, const gsl_lite::czstring& streamName)
     : m_fmtContext{fmtContext}
 {
   if(const auto err = avformat_open_input(&m_fmtContext, streamName, nullptr, nullptr); err < 0)
@@ -71,13 +71,12 @@ BasicFfmpegStreamSource::~BasicFfmpegStreamSource()
   avformat_close_input(&m_fmtContext);
 }
 
-void BasicFfmpegStreamSource::fillQueues(bool looping)
+void BasicFfmpegStreamSource::fillQueues(const bool looping)
 {
   while(!m_decoder->filled())
   {
-    const auto err = av_read_frame(m_fmtContext, &m_packet);
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    if(err == AVERROR_EOF && looping)
+    if(const auto err = av_read_frame(m_fmtContext, &m_packet); err == AVERROR_EOF && looping)
     {
       m_decoder->seek(std::chrono::milliseconds{0});
       continue;
@@ -92,7 +91,7 @@ void BasicFfmpegStreamSource::fillQueues(bool looping)
   }
 }
 
-size_t BasicFfmpegStreamSource::read(int16_t* buffer, size_t bufferSize, bool looping)
+size_t BasicFfmpegStreamSource::read(int16_t* buffer, const size_t bufferSize, const bool looping)
 {
   fillQueues(looping);
   size_t written = 0;
@@ -111,7 +110,7 @@ size_t BasicFfmpegStreamSource::read(int16_t* buffer, size_t bufferSize, bool lo
   return written;
 }
 
-audio::Clock::duration BasicFfmpegStreamSource::getDuration() const
+Clock::duration BasicFfmpegStreamSource::getDuration() const
 {
   return m_decoder->getDuration();
 }
@@ -142,11 +141,11 @@ FfmpegStreamSource::FfmpegStreamSource(const std::filesystem::path& filename)
 {
 }
 
-FfmpegMemoryStreamSource::FfmpegMemoryStreamSource(const gsl::span<const uint8_t>& data)
-    : detail::FfmpegMemoryStreamSourceFileData{data}
-    , BasicFfmpegStreamSource{[this]()
+FfmpegMemoryStreamSource::FfmpegMemoryStreamSource(const gsl_lite::span<const uint8_t>& data)
+    : FfmpegMemoryStreamSourceFileData{data}
+    , BasicFfmpegStreamSource{[this]
                               {
-                                auto ctx = avformat_alloc_context();
+                                const auto ctx = avformat_alloc_context();
                                 ctx->pb = avio_alloc_context(dataBuffer,
                                                              0,
                                                              0,
@@ -166,51 +165,52 @@ FfmpegMemoryStreamSource::~FfmpegMemoryStreamSource()
   avio_context_free(&getFmtContext()->pb);
 }
 
-int FfmpegMemoryStreamSource::ffmpegRead(void* opaque, uint8_t* buf, int bufSize)
+int FfmpegMemoryStreamSource::ffmpegRead(void* opaque, uint8_t* buf, const int bufSize)
 {
   auto* h = static_cast<FfmpegMemoryStreamSource*>(opaque);
-  const auto n = std::min(h->data.size() - h->dataPosition, gsl::narrow<size_t>(bufSize));
+  const auto n = std::min(h->data.size() - h->dataPosition, gsl_lite::narrow<size_t>(bufSize));
   if(n == 0)
     return AVERROR_EOF; // NOLINT(hicpp-signed-bitwise)
 
   std::copy_n(&h->data[h->dataPosition], n, buf);
   h->dataPosition += n;
-  return gsl::narrow<int>(n);
+  return gsl_lite::narrow<int>(n);
 }
 
 // NOLINTNEXTLINE(*-easily-swappable-parameters)
-int64_t FfmpegMemoryStreamSource::ffmpegSeek(void* opaque, int64_t offset, int whence)
+int64_t FfmpegMemoryStreamSource::ffmpegSeek(void* opaque, const int64_t offset, const int whence)
 {
   auto* h = static_cast<FfmpegMemoryStreamSource*>(opaque);
   if((whence & AVSEEK_SIZE) != 0) // NOLINT(hicpp-signed-bitwise)
-    return gsl::narrow<int64_t>(h->data.size());
+    return gsl_lite::narrow<int64_t>(h->data.size());
 
   switch(whence)
   {
   case SEEK_SET:
-    h->dataPosition = gsl::narrow_cast<size_t>(std::clamp(offset, int64_t{0}, gsl::narrow<int64_t>(h->data.size())));
+    h->dataPosition
+      = gsl_lite::narrow_cast<size_t>(std::clamp(offset, int64_t{0}, gsl_lite::narrow<int64_t>(h->data.size())));
     break;
   case SEEK_CUR:
-    h->dataPosition = gsl::narrow_cast<size_t>(gsl::narrow_cast<size_t>(
-      std::clamp(gsl::narrow<int64_t>(h->dataPosition + offset), int64_t{0}, gsl::narrow<int64_t>(h->data.size()))));
+    h->dataPosition = gsl_lite::narrow_cast<size_t>(gsl_lite::narrow_cast<size_t>(std::clamp(
+      gsl_lite::narrow<int64_t>(h->dataPosition + offset), int64_t{0}, gsl_lite::narrow<int64_t>(h->data.size()))));
     break;
   case SEEK_END:
-    h->dataPosition = gsl::narrow_cast<size_t>(
-      std::clamp(gsl::narrow<int64_t>(h->data.size() - offset), int64_t{0}, gsl::narrow<int64_t>(h->data.size())));
+    h->dataPosition = gsl_lite::narrow_cast<size_t>(std::clamp(
+      gsl_lite::narrow<int64_t>(h->data.size() - offset), int64_t{0}, gsl_lite::narrow<int64_t>(h->data.size())));
     break;
   default:
     BOOST_THROW_EXCEPTION(std::domain_error("invalid whence value"));
   }
-  return gsl::narrow_cast<int64_t>(h->dataPosition);
+  return gsl_lite::narrow_cast<int64_t>(h->dataPosition);
 }
 
 FfmpegSubStreamStreamSource::FfmpegSubStreamStreamSource(std::unique_ptr<std::istream>&& istream,
-                                                         size_t start,
-                                                         size_t end)
-    : detail::FfmpegMemoryStreamSourceSubFileData{std::move(istream), start, end}
-    , BasicFfmpegStreamSource{[this]()
+                                                         const size_t start,
+                                                         const size_t end)
+    : FfmpegMemoryStreamSourceSubFileData{std::move(istream), start, end}
+    , BasicFfmpegStreamSource{[this]
                               {
-                                auto ctx = avformat_alloc_context();
+                                const auto ctx = avformat_alloc_context();
                                 ctx->pb = avio_alloc_context(dataBuffer,
                                                              0,
                                                              0,
@@ -230,41 +230,41 @@ FfmpegSubStreamStreamSource::~FfmpegSubStreamStreamSource()
   avio_context_free(&getFmtContext()->pb);
 }
 
-int FfmpegSubStreamStreamSource::ffmpegRead(void* opaque, uint8_t* buf, int bufSize)
+int FfmpegSubStreamStreamSource::ffmpegRead(void* opaque, uint8_t* buf, const int bufSize)
 {
   auto* h = static_cast<FfmpegSubStreamStreamSource*>(opaque);
-  const auto n = std::min(h->dataEnd - h->dataStart - h->dataPosition, gsl::narrow<size_t>(bufSize));
-  h->istream->seekg(gsl::narrow<std::streamoff>(h->dataStart + h->dataPosition));
+  const auto n = std::min(h->dataEnd - h->dataStart - h->dataPosition, gsl_lite::narrow<size_t>(bufSize));
+  h->istream->seekg(gsl_lite::narrow<std::streamoff>(h->dataStart + h->dataPosition));
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-  h->istream->read(reinterpret_cast<char*>(buf), gsl::narrow<std::streamsize>(n));
+  h->istream->read(reinterpret_cast<char*>(buf), gsl_lite::narrow<std::streamsize>(n));
   h->dataPosition += n;
-  return gsl::narrow<int>(n);
+  return gsl_lite::narrow<int>(n);
 }
 
 // NOLINTNEXTLINE(*-easily-swappable-parameters)
-int64_t FfmpegSubStreamStreamSource::ffmpegSeek(void* opaque, int64_t offset, int whence)
+int64_t FfmpegSubStreamStreamSource::ffmpegSeek(void* opaque, const int64_t offset, const int whence)
 {
   auto* h = static_cast<FfmpegSubStreamStreamSource*>(opaque);
   const auto size = h->dataEnd - h->dataStart;
   if((whence & AVSEEK_SIZE) != 0) // NOLINT(hicpp-signed-bitwise)
-    return gsl::narrow<int64_t>(size);
+    return gsl_lite::narrow<int64_t>(size);
 
   switch(whence)
   {
   case SEEK_SET:
-    h->dataPosition = gsl::narrow_cast<size_t>(std::clamp(offset, int64_t{0}, gsl::narrow<int64_t>(size)));
+    h->dataPosition = gsl_lite::narrow_cast<size_t>(std::clamp(offset, int64_t{0}, gsl_lite::narrow<int64_t>(size)));
     break;
   case SEEK_CUR:
-    h->dataPosition = gsl::narrow_cast<size_t>(gsl::narrow_cast<size_t>(
-      std::clamp(gsl::narrow<int64_t>(h->dataPosition + offset), int64_t{0}, gsl::narrow<int64_t>(size))));
+    h->dataPosition = gsl_lite::narrow_cast<size_t>(gsl_lite::narrow_cast<size_t>(
+      std::clamp(gsl_lite::narrow<int64_t>(h->dataPosition + offset), int64_t{0}, gsl_lite::narrow<int64_t>(size))));
     break;
   case SEEK_END:
-    h->dataPosition = gsl::narrow_cast<size_t>(
-      std::clamp(gsl::narrow<int64_t>(size - offset), int64_t{0}, gsl::narrow<int64_t>(size)));
+    h->dataPosition = gsl_lite::narrow_cast<size_t>(
+      std::clamp(gsl_lite::narrow<int64_t>(size - offset), int64_t{0}, gsl_lite::narrow<int64_t>(size)));
     break;
   default:
     BOOST_THROW_EXCEPTION(std::domain_error("invalid whence value"));
   }
-  return gsl::narrow_cast<int64_t>(h->dataPosition);
+  return gsl_lite::narrow_cast<int64_t>(h->dataPosition);
 }
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/ffmpegstreamsource.h b/src/audio/ffmpegstreamsource.h
index 2fde23f4c..fd9e03a04 100644
--- a/src/audio/ffmpegstreamsource.h
+++ b/src/audio/ffmpegstreamsource.h
@@ -7,7 +7,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <istream>
 #include <memory>
 #include <utility>
@@ -23,10 +23,10 @@ namespace audio
 {
 class AudioStreamDecoder;
 
-class BasicFfmpegStreamSource : public audio::AbstractStreamSource
+class BasicFfmpegStreamSource : public AbstractStreamSource
 {
 public:
-  explicit BasicFfmpegStreamSource(AVFormatContext* fmtContext, const gsl::czstring& streamName);
+  explicit BasicFfmpegStreamSource(AVFormatContext* fmtContext, const gsl_lite::czstring& streamName);
   ~BasicFfmpegStreamSource() override;
 
   void fillQueues(bool looping);
@@ -40,7 +40,7 @@ class BasicFfmpegStreamSource : public audio::AbstractStreamSource
 
   void seek(const std::chrono::milliseconds& position) final;
 
-  [[nodiscard]] audio::Clock::duration getDuration() const final;
+  [[nodiscard]] Clock::duration getDuration() const final;
 
 protected:
   [[nodiscard]] auto getFmtContext() const noexcept
@@ -74,10 +74,10 @@ struct FfmpegMemoryStreamSourceScratchData
 
 struct FfmpegMemoryStreamSourceFileData
 {
-  gsl::span<const uint8_t> data;
+  gsl_lite::span<const uint8_t> data;
   size_t dataPosition = 0;
 
-  explicit FfmpegMemoryStreamSourceFileData(const gsl::span<const uint8_t>& data) noexcept
+  explicit FfmpegMemoryStreamSourceFileData(const gsl_lite::span<const uint8_t>& data) noexcept
       : data{data}
   {
   }
@@ -92,7 +92,9 @@ struct FfmpegMemoryStreamSourceSubFileData
   size_t dataEnd = 0;
   size_t dataPosition = 0;
 
-  explicit FfmpegMemoryStreamSourceSubFileData(std::unique_ptr<std::istream>&& istream, size_t start, size_t end)
+  explicit FfmpegMemoryStreamSourceSubFileData(std::unique_ptr<std::istream>&& istream,
+                                               const size_t start,
+                                               const size_t end)
       : istream{std::move(istream)}
       , dataStart{start}
       , dataEnd{end}
@@ -105,12 +107,12 @@ struct FfmpegMemoryStreamSourceSubFileData
 } // namespace detail
 
 class FfmpegMemoryStreamSource final
-    : private detail::FfmpegMemoryStreamSourceScratchData
-    , private detail::FfmpegMemoryStreamSourceFileData
+    : detail::FfmpegMemoryStreamSourceScratchData
+    , detail::FfmpegMemoryStreamSourceFileData
     , public BasicFfmpegStreamSource
 {
 public:
-  explicit FfmpegMemoryStreamSource(const gsl::span<const uint8_t>& data);
+  explicit FfmpegMemoryStreamSource(const gsl_lite::span<const uint8_t>& data);
   ~FfmpegMemoryStreamSource() override;
 
 private:
@@ -119,8 +121,8 @@ class FfmpegMemoryStreamSource final
 };
 
 class FfmpegSubStreamStreamSource
-    : private detail::FfmpegMemoryStreamSourceScratchData
-    , private detail::FfmpegMemoryStreamSourceSubFileData
+    : detail::FfmpegMemoryStreamSourceScratchData
+    , detail::FfmpegMemoryStreamSourceSubFileData
     , public BasicFfmpegStreamSource
 {
 public:
@@ -131,4 +133,4 @@ class FfmpegSubStreamStreamSource
   static int ffmpegRead(void* opaque, uint8_t* buf, int bufSize);
   static int64_t ffmpegSeek(void* opaque, int64_t offset, int whence);
 };
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/handle.h b/src/audio/handle.h
index 2dc25f027..fe0df5257 100644
--- a/src/audio/handle.h
+++ b/src/audio/handle.h
@@ -3,7 +3,7 @@
 #include "utils.h"
 
 #include <AL/al.h> // IWYU pragma: export
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace audio
 {
@@ -48,4 +48,4 @@ class Handle
   ALuint m_handle;
   Deleter* m_deleter;
 };
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/listener.cpp b/src/audio/listener.cpp
index 5c615f0b5..f0ab31ca0 100644
--- a/src/audio/listener.cpp
+++ b/src/audio/listener.cpp
@@ -2,7 +2,7 @@
 
 #include "soundengine.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <unordered_set>
 #include <utility>
 
@@ -17,7 +17,7 @@ Listener::~Listener()
   m_engine->m_listeners.erase(this);
 }
 
-Listener::Listener(const gsl::not_null<SoundEngine*>& engine)
+Listener::Listener(const gsl_lite::not_null<SoundEngine*>& engine)
     : m_engine{engine}
 {
   m_engine->m_listeners.emplace(this);
@@ -61,4 +61,4 @@ Listener& Listener::operator=(Listener&& rhs) noexcept
     m_engine->m_listeners.emplace(this);
   return *this;
 }
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/listener.h b/src/audio/listener.h
index 3a385ba7a..44c56fea4 100644
--- a/src/audio/listener.h
+++ b/src/audio/listener.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace audio
 {
@@ -12,11 +12,11 @@ class Listener
   friend class SoundEngine;
 
 public:
-  explicit Listener(const gsl::not_null<SoundEngine*>& engine);
+  explicit Listener(const gsl_lite::not_null<SoundEngine*>& engine);
   virtual ~Listener();
 
   Listener(const Listener& rhs)
-      : Listener{gsl::not_null{rhs.m_engine}}
+      : Listener{gsl_lite::not_null{rhs.m_engine}}
   {
   }
 
@@ -32,4 +32,4 @@ class Listener
 private:
   mutable SoundEngine* m_engine = nullptr;
 };
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/loadefx.cpp b/src/audio/loadefx.cpp
index f30bb676e..bee9531e2 100644
--- a/src/audio/loadefx.cpp
+++ b/src/audio/loadefx.cpp
@@ -6,7 +6,7 @@
 #include <AL/alc.h>
 #include <AL/efx.h>
 #include <boost/assert.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 #ifndef AL_ALEXT_PROTOTYPES
 
@@ -53,7 +53,7 @@ LPALGETAUXILIARYEFFECTSLOTIV alGetAuxiliaryEffectSlotiv = nullptr;
 LPALGETAUXILIARYEFFECTSLOTF alGetAuxiliaryEffectSlotf = nullptr;
 LPALGETAUXILIARYEFFECTSLOTFV alGetAuxiliaryEffectSlotfv = nullptr;
 
-void audio::loadALExtFunctions(const gsl::not_null<ALCdevice*>& device)
+void audio::loadALExtFunctions(const gsl_lite::not_null<ALCdevice*>& device)
 {
   static bool isLoaded = false;
   if(isLoaded)
@@ -108,4 +108,4 @@ void audio::loadALExtFunctions(const gsl::not_null<ALCdevice*>& device)
   isLoaded = true;
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/audio/loadefx.h b/src/audio/loadefx.h
index a658a10d4..f57ac95d9 100644
--- a/src/audio/loadefx.h
+++ b/src/audio/loadefx.h
@@ -2,13 +2,13 @@
 
 #include <AL/alc.h>
 #include <AL/efx.h> // IWYU pragma: export
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 #ifdef AL_ALEXT_PROTOTYPES
 
 namespace audio
 {
-inline void loadALExtFunctions(const gsl::not_null<ALCdevice*>&)
+inline void loadALExtFunctions(const gsl_lite::not_null<ALCdevice*>&)
 {
   // Nothing to do here
 }
@@ -18,7 +18,7 @@ inline void loadALExtFunctions(const gsl::not_null<ALCdevice*>&)
 
 namespace audio
 {
-void loadALExtFunctions(const gsl::not_null<ALCdevice*>&);
+void loadALExtFunctions(const gsl_lite::not_null<ALCdevice*>&);
 } // namespace audio
 
 // ReSharper disable IdentifierTypo
@@ -62,4 +62,4 @@ extern LPALGETAUXILIARYEFFECTSLOTIV alGetAuxiliaryEffectSlotiv;
 extern LPALGETAUXILIARYEFFECTSLOTF alGetAuxiliaryEffectSlotf;
 extern LPALGETAUXILIARYEFFECTSLOTFV alGetAuxiliaryEffectSlotfv;
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/audio/soundengine.cpp b/src/audio/soundengine.cpp
index 1f17d9ead..33196a8b0 100644
--- a/src/audio/soundengine.cpp
+++ b/src/audio/soundengine.cpp
@@ -23,11 +23,12 @@
 #include <cstddef>
 #include <filesystem>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <iterator>
 #include <map>
 #include <memory>
+#include <ranges>
 #include <utility>
 #include <vector>
 
@@ -47,16 +48,15 @@ void SoundEngine::update()
     if(emitter != nullptr)
       pos = emitter->getPosition();
 
-    for(auto& [id, voices] : idsAndVoices)
+    for(auto& voices : idsAndVoices | std::views::values)
     {
       auto old = std::move(voices);
-      std::copy_if(old.begin(),
-                   old.end(),
-                   std::back_inserter(voices),
-                   [](const auto& v)
-                   {
-                     return !v.expired();
-                   });
+      std::ranges::copy_if(old,
+                           std::back_inserter(voices),
+                           [](const auto& v)
+                           {
+                             return !v.expired();
+                           });
 
       if(emitter == nullptr)
         continue;
@@ -72,7 +72,7 @@ void SoundEngine::update()
   }
 }
 
-std::vector<gslu::nn_shared<Voice>> SoundEngine::getVoicesForBuffer(Emitter* emitter, size_t buffer) const
+std::vector<gslu::nn_shared<Voice>> SoundEngine::getVoicesForBuffer(Emitter* emitter, const size_t buffer) const
 {
   const auto it1 = m_voices.find(emitter);
   if(it1 == m_voices.end())
@@ -90,9 +90,9 @@ std::vector<gslu::nn_shared<Voice>> SoundEngine::getVoicesForBuffer(Emitter* emi
   return result;
 }
 
-bool SoundEngine::stopBuffer(size_t bufferId, const Emitter* emitter)
+bool SoundEngine::stopBuffer(const size_t bufferId, const Emitter* emitter)
 {
-  auto buffersVoicesIt = m_voices.find(emitter);
+  const auto buffersVoicesIt = m_voices.find(emitter);
   if(buffersVoicesIt == m_voices.end())
     return false;
 
@@ -116,9 +116,12 @@ bool SoundEngine::stopBuffer(size_t bufferId, const Emitter* emitter)
 }
 
 gslu::nn_shared<BufferVoice> SoundEngine::playBuffer(
-  const gslu::nn_shared<BufferHandle>& buffer, size_t bufferId, ALfloat pitch, ALfloat volume, Emitter* emitter)
+  const gslu::nn_shared<BufferHandle>& buffer,
+                                                     const size_t bufferId,
+                                                     const ALfloat pitch,
+                                                     const ALfloat volume, Emitter* emitter)
 {
-  auto voice = gsl::make_shared<BufferVoice>(buffer);
+  auto voice = gsl_lite::make_shared<BufferVoice>(buffer);
   voice->setPitch(pitch);
   voice->setLocalGain(volume);
   if(emitter != nullptr)
@@ -137,7 +140,7 @@ void SoundEngine::dropEmitter(const Emitter* emitter)
   if(it == m_voices.end())
     return;
 
-  for(const auto& [id, voices] : it->second)
+  for(const auto& voices : it->second | std::views::values)
     for(const auto& voice : voices)
       if(const auto locked = voice.lock())
         locked->stop();
@@ -146,7 +149,7 @@ void SoundEngine::dropEmitter(const Emitter* emitter)
 }
 
 SoundEngine::SoundEngine()
-    : m_device{gsl::make_unique<Device>()}
+    : m_device{gsl_lite::make_unique<Device>()}
 {
 }
 
@@ -165,7 +168,10 @@ SoundEngine::~SoundEngine()
 }
 
 gslu::nn_shared<BufferVoice> SoundEngine::playBuffer(
-  const gslu::nn_shared<BufferHandle>& buffer, size_t bufferId, ALfloat pitch, ALfloat volume, const glm::vec3& pos)
+  const gslu::nn_shared<BufferHandle>& buffer,
+                                                     const size_t bufferId,
+                                                     const ALfloat pitch,
+                                                     const ALfloat volume, const glm::vec3& pos)
 {
   auto voice = playBuffer(buffer, bufferId, pitch, volume, nullptr);
   voice->setPosition(pos);
@@ -175,7 +181,7 @@ gslu::nn_shared<BufferVoice> SoundEngine::playBuffer(
 void SoundEngine::reset()
 {
   BOOST_LOG_TRIVIAL(debug) << "Resetting sound engine";
-  for(const auto& [streamId, slotStream] : m_slots)
+  for(const auto& slotStream : m_slots | std::views::values)
     m_device->removeStream(slotStream.stream);
   m_slots.clear();
   m_device->reset();
@@ -185,22 +191,22 @@ void SoundEngine::reset()
   m_listeners.clear();
 }
 
-void SoundEngine::setListenerGain(float gain)
+void SoundEngine::setListenerGain(const float gain)
 {
   m_device->setListenerGain(gain);
 }
 
 void SoundEngine::setSlotStream(size_t slot,
-                                const gsl::shared_ptr<StreamVoice>& stream,
+                                const gsl_lite::shared_ptr<StreamVoice>& stream,
                                 const std::filesystem::path& absolutePath)
 {
   m_slots.erase(slot);
   m_slots.emplace(slot, SlotStream{stream, absolutePath});
 }
 
-std::shared_ptr<StreamVoice> SoundEngine::tryGetStream(size_t slot)
+std::shared_ptr<StreamVoice> SoundEngine::tryGetStream(const size_t slot)
 {
-  if(auto slotIt = m_slots.find(slot); slotIt != m_slots.end())
+  if(const auto slotIt = m_slots.find(slot); slotIt != m_slots.end())
   {
     return slotIt->second.stream.lock();
   }
@@ -208,7 +214,7 @@ std::shared_ptr<StreamVoice> SoundEngine::tryGetStream(size_t slot)
   return nullptr;
 }
 
-void SoundEngine::freeSlot(size_t slot) noexcept
+void SoundEngine::freeSlot(const size_t slot) noexcept
 {
   m_slots.erase(slot);
 }
@@ -219,8 +225,7 @@ void SoundEngine::serializeStreams(const serialization::Serializer<engine::world
   std::map<size_t, std::filesystem::path> names;
   std::map<size_t, bool> looping;
 
-  auto tmp = std::exchange(m_slots, {});
-  for(const auto& [slot, slotStream] : tmp)
+  for(auto tmp = std::exchange(m_slots, {}); const auto& [slot, slotStream] : tmp)
   {
     if(auto stream = slotStream.stream.lock(); stream != nullptr && !stream->isStopped())
     {
@@ -243,7 +248,7 @@ void SoundEngine::deserializeStreams(const serialization::Deserializer<engine::w
   std::map<size_t, std::filesystem::path> names;
   std::map<size_t, bool> looping;
 
-  for(const auto& [slot, slotStream] : m_slots)
+  for(const auto& slotStream : m_slots | std::views::values)
     m_device->removeStream(slotStream.stream);
   m_slots.clear();
 
@@ -270,4 +275,4 @@ gslu::nn_shared<StreamVoice> SoundEngine::createStream(const std::filesystem::pa
                                 DefaultBufferCount,
                                 initialPosition);
 }
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/soundengine.h b/src/audio/soundengine.h
index 6ab12f3f5..f0d8ee471 100644
--- a/src/audio/soundengine.h
+++ b/src/audio/soundengine.h
@@ -7,7 +7,7 @@
 #include <cstddef>
 #include <filesystem>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 #include <memory>
@@ -82,8 +82,9 @@ class SoundEngine final
 
   void reset();
 
-  void
-    setSlotStream(size_t slot, const gsl::shared_ptr<StreamVoice>& stream, const std::filesystem::path& absolutePath);
+  void setSlotStream(size_t slot,
+                     const gsl_lite::shared_ptr<StreamVoice>& stream,
+                     const std::filesystem::path& absolutePath);
   [[nodiscard]] std::shared_ptr<StreamVoice> tryGetStream(size_t slot);
   void freeSlot(size_t slot) noexcept;
   void serializeStreams(const serialization::Serializer<engine::world::World>& ser);
@@ -92,6 +93,7 @@ class SoundEngine final
                           VoiceGroup& streamGroup);
   [[nodiscard]] gslu::nn_shared<StreamVoice> createStream(const std::filesystem::path& path,
                                                           const std::chrono::milliseconds& initialPosition);
+
   [[nodiscard]] const auto& getSlots() const noexcept
   {
     return m_slots;
@@ -107,4 +109,4 @@ class SoundEngine final
 
   std::map<size_t, SlotStream> m_slots;
 };
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/sourcehandle.cpp b/src/audio/sourcehandle.cpp
index 4d370e444..3d300f802 100644
--- a/src/audio/sourcehandle.cpp
+++ b/src/audio/sourcehandle.cpp
@@ -17,7 +17,7 @@
 
 namespace audio
 {
-SourceHandle::SourceHandle(bool positional)
+SourceHandle::SourceHandle(const bool positional)
     : Handle{alGenSources, alIsSource, alDeleteSources}
 {
   if(positional)
@@ -136,12 +136,11 @@ std::shared_ptr<BufferHandle> StreamingSourceHandle::unqueueBuffer()
   ALuint unqueued;
   AL_ASSERT(alSourceUnqueueBuffers(*this, 1, &unqueued));
 
-  auto it = std::find_if(m_queuedBuffers.begin(),
-                         m_queuedBuffers.end(),
-                         [unqueued](const std::shared_ptr<BufferHandle>& buffer)
-                         {
-                           return *buffer == unqueued;
-                         });
+  const auto it = std::ranges::find_if(m_queuedBuffers,
+                                       [unqueued](const std::shared_ptr<BufferHandle>& buffer)
+                                       {
+                                         return *buffer == unqueued;
+                                       });
 
   if(it == m_queuedBuffers.end())
     BOOST_THROW_EXCEPTION(std::runtime_error("Unqueued buffer not in queue"));
diff --git a/src/audio/sourcehandle.h b/src/audio/sourcehandle.h
index d6e7dab98..7d1d3e2c9 100644
--- a/src/audio/sourcehandle.h
+++ b/src/audio/sourcehandle.h
@@ -57,7 +57,7 @@ class StreamingSourceHandle final : public SourceHandle
   [[nodiscard]] bool isStopped() const override;
 
   void gracefullyStop(const std::chrono::milliseconds& sleep);
-  void stop() final;
+  void stop() override;
 
   [[nodiscard]] ALint getBuffersProcessed() const;
 
diff --git a/src/audio/streamvoice.cpp b/src/audio/streamvoice.cpp
index 062cf8f32..7da3ed352 100644
--- a/src/audio/streamvoice.cpp
+++ b/src/audio/streamvoice.cpp
@@ -12,7 +12,7 @@
 #include <boost/throw_exception.hpp>
 #include <chrono>
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <stdexcept>
 #include <utility>
@@ -78,8 +78,7 @@ void StreamVoice::update()
   while(processed-- > 0)
   {
     const auto buffer = m_streamSource->unqueueBuffer();
-    auto it = std::find(m_buffers.begin(), m_buffers.end(), buffer);
-    if(it == m_buffers.end())
+    if(auto it = std::ranges::find(m_buffers, buffer); it == m_buffers.end())
     {
       BOOST_LOG_TRIVIAL(error) << "Got unexpected buffer ID #" << static_cast<ALuint>(*buffer);
       continue;
@@ -119,4 +118,4 @@ Clock::duration StreamVoice::getDuration() const
 }
 
 StreamVoice::~StreamVoice() = default;
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/streamvoice.h b/src/audio/streamvoice.h
index 4c35336e2..624ef1aa5 100644
--- a/src/audio/streamvoice.h
+++ b/src/audio/streamvoice.h
@@ -6,7 +6,7 @@
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <vector>
@@ -18,7 +18,7 @@ class BufferHandle;
 class AbstractStreamSource;
 class SourceHandle;
 
-class StreamVoice : public Voice
+class StreamVoice final : public Voice
 {
 public:
   explicit StreamVoice(std::unique_ptr<StreamingSourceHandle>&& streamSource,
@@ -49,7 +49,7 @@ class StreamVoice : public Voice
   [[nodiscard]] Clock::duration getDuration() const override;
 
 private:
-  gsl::not_null<StreamingSourceHandle*> m_streamSource;
+  gsl_lite::not_null<StreamingSourceHandle*> m_streamSource;
   std::unique_ptr<AbstractStreamSource> m_stream;
   std::vector<gslu::nn_shared<BufferHandle>> m_buffers;
   std::vector<int16_t> m_sampleBuffer;
@@ -57,4 +57,4 @@ class StreamVoice : public Voice
 
   bool fillBuffer(BufferHandle& buffer);
 };
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/utils.cpp b/src/audio/utils.cpp
index c77bb2259..59457ed63 100644
--- a/src/audio/utils.cpp
+++ b/src/audio/utils.cpp
@@ -4,14 +4,14 @@
 #include <AL/alc.h>
 #include <boost/log/trivial.hpp>
 #include <boost/throw_exception.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 #include <stdexcept>
 #include <string>
 
 namespace audio::detail
 {
-void checkALError(const gsl::czstring code, const gsl::czstring func, const int line)
+void checkALError(const gsl_lite::czstring code, const gsl_lite::czstring func, const int line)
 {
   gsl_Expects(code != nullptr);
   gsl_Expects(func != nullptr);
@@ -20,7 +20,7 @@ void checkALError(const gsl::czstring code, const gsl::czstring func, const int
   if(err == AL_NO_ERROR)
     return;
 
-  gsl::czstring errStr = "<unknown>";
+  auto errStr = "<unknown>";
   switch(err)
   {
   case AL_INVALID_NAME:
@@ -48,7 +48,7 @@ void checkALError(const gsl::czstring code, const gsl::czstring func, const int
   BOOST_THROW_EXCEPTION(std::runtime_error(std::string{"OpenAL error: "} + errStr));
 }
 
-void checkALCError(ALCdevice* device, const gsl::czstring code, const gsl::czstring func, const int line)
+void checkALCError(ALCdevice* device, const gsl_lite::czstring code, const gsl_lite::czstring func, const int line)
 {
   gsl_Expects(code != nullptr);
   gsl_Expects(func != nullptr);
@@ -57,7 +57,7 @@ void checkALCError(ALCdevice* device, const gsl::czstring code, const gsl::czstr
   if(err == ALC_NO_ERROR)
     return;
 
-  gsl::czstring errStr = "<unknown>";
+  auto errStr = "<unknown>";
   switch(err)
   {
   case ALC_INVALID_DEVICE:
@@ -84,4 +84,4 @@ void checkALCError(ALCdevice* device, const gsl::czstring code, const gsl::czstr
                              << ") in statement '" << code << "': " << errStr;
   BOOST_THROW_EXCEPTION(std::runtime_error(std::string{"OpenAL error: "} + errStr));
 }
-} // namespace audio::detail
+} // namespace audio::detail
\ No newline at end of file
diff --git a/src/audio/utils.h b/src/audio/utils.h
index c04fba501..dc96e333a 100644
--- a/src/audio/utils.h
+++ b/src/audio/utils.h
@@ -2,16 +2,16 @@
 
 #include <AL/alc.h>
 #include <boost/current_function.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace audio::detail
 {
-extern void checkALError(gsl::czstring code, gsl::czstring func, int line);
-extern void checkALCError(ALCdevice* device, gsl::czstring code, gsl::czstring func, int line);
+extern void checkALError(gsl_lite::czstring code, gsl_lite::czstring func, int line);
+extern void checkALCError(ALCdevice* device, gsl_lite::czstring code, gsl_lite::czstring func, int line);
 
 template<typename F>
 // NOLINTNEXTLINE(*-easily-swappable-parameters)
-auto alAssertFn(F code, gsl::czstring codeStr, gsl::czstring func, int line) -> decltype(code())
+auto alAssertFn(F code, const gsl_lite::czstring codeStr, const gsl_lite::czstring func, const int line) -> decltype(code())
 {
   const auto result = code();
 #ifndef NDEBUG
@@ -26,7 +26,8 @@ auto alAssertFn(F code, gsl::czstring codeStr, gsl::czstring func, int line) ->
 
 template<typename F>
 // NOLINTNEXTLINE(*-easily-swappable-parameters)
-auto alcAssertFn(ALCdevice* device, F code, gsl::czstring codeStr, gsl::czstring func, int line) -> decltype(code())
+auto alcAssertFn(ALCdevice* device, F code, const gsl_lite::czstring codeStr, const gsl_lite::czstring func, const int line)
+  -> decltype(code())
 {
   const auto result = code();
 #ifndef NDEBUG
@@ -79,4 +80,4 @@ auto alcAssertFn(ALCdevice* device, F code, gsl::czstring codeStr, gsl::czstring
     {                                      \
       code;                                \
     } while(false)
-#endif
+#endif
\ No newline at end of file
diff --git a/src/audio/voice.cpp b/src/audio/voice.cpp
index 8f72f66ba..4c306df7d 100644
--- a/src/audio/voice.cpp
+++ b/src/audio/voice.cpp
@@ -19,7 +19,7 @@ void Voice::setGroupGain(const ALfloat groupGain)
   updateGain();
 }
 
-void Voice::setGroupGainLogarithmic(ALfloat groupGain)
+void Voice::setGroupGainLogarithmic(const ALfloat groupGain)
 {
   setGroupGain(toLogarithmicVolumeExact(groupGain));
 }
@@ -30,7 +30,7 @@ void Voice::setLocalGain(const ALfloat localGain)
   updateGain();
 }
 
-void Voice::setLocalGainLogarithmic(ALfloat localGain)
+void Voice::setLocalGainLogarithmic(const ALfloat localGain)
 {
   setLocalGain(toLogarithmicVolumeExact(localGain));
 }
@@ -76,14 +76,14 @@ void Voice::stop()
   m_playStartTime.reset();
 }
 
-void Voice::setLooping(bool looping)
+void Voice::setLooping(const bool looping)
 {
   if(m_source != nullptr)
     m_source->setLooping(looping);
   m_looping = looping;
 }
 
-void Voice::setPitch(ALfloat pitch)
+void Voice::setPitch(const ALfloat pitch)
 {
   if(m_source != nullptr)
     m_source->setPitch(pitch);
diff --git a/src/audio/voicegroup.cpp b/src/audio/voicegroup.cpp
index cd82131f9..1bcb90022 100644
--- a/src/audio/voicegroup.cpp
+++ b/src/audio/voicegroup.cpp
@@ -4,7 +4,7 @@
 
 #include <AL/al.h>
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <iterator>
 #include <utility>
@@ -14,12 +14,11 @@ namespace audio
 void VoiceGroup::add(gslu::nn_shared<Voice> voice)
 {
   voice->setGroupGainLogarithmic(m_gain);
-  if(std::find_if(m_voices.begin(),
-                  m_voices.end(),
-                  [&voice](const auto& weakVoice)
-                  {
-                    return weakVoice.lock() == voice;
-                  })
+  if(std::ranges::find_if(m_voices,
+                          [&voice](const auto& weakVoice)
+                          {
+                            return weakVoice.lock() == voice;
+                          })
      == m_voices.end())
   {
     m_voices.emplace_back(voice.get());
@@ -29,42 +28,40 @@ void VoiceGroup::add(gslu::nn_shared<Voice> voice)
 void VoiceGroup::remove(const gslu::nn_shared<Voice>& voice)
 {
   decltype(m_voices) cleaned;
-  std::copy_if(m_voices.begin(),
-               m_voices.end(),
-               std::back_inserter(cleaned),
-               [&voice](const auto& weakVoice)
-               {
-                 if(auto v = weakVoice.lock())
-                   return v == voice;
-                 else
-                   return false;
-               });
+  std::ranges::copy_if(m_voices,
+                       std::back_inserter(cleaned),
+                       [&voice](const auto& weakVoice)
+                       {
+                         if(auto v = weakVoice.lock())
+                           return v == voice;
+                         else
+                           return false;
+                       });
   m_voices = std::move(cleaned);
 }
 
 void VoiceGroup::cleanup()
 {
   decltype(m_voices) cleaned;
-  std::copy_if(m_voices.begin(),
-               m_voices.end(),
-               std::back_inserter(cleaned),
-               [](const auto& weakVoice)
-               {
-                 if(auto v = weakVoice.lock())
-                   return !v->isStopped();
-                 else
-                   return false;
-               });
+  std::ranges::copy_if(m_voices,
+                       std::back_inserter(cleaned),
+                       [](const auto& weakVoice)
+                       {
+                         if(auto v = weakVoice.lock())
+                           return !v->isStopped();
+                         else
+                           return false;
+                       });
   m_voices = std::move(cleaned);
 }
 
-void VoiceGroup::setGain(ALfloat gain)
+void VoiceGroup::setGain(const ALfloat gain)
 {
   m_gain = gain;
   for(const auto& weakVoice : m_voices)
   {
-    if(auto v = weakVoice.lock())
+    if(const auto v = weakVoice.lock())
       v->setGroupGainLogarithmic(gain);
   }
 }
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/audio/voicegroup.h b/src/audio/voicegroup.h
index ed7b9bce1..07f9d8eb1 100644
--- a/src/audio/voicegroup.h
+++ b/src/audio/voicegroup.h
@@ -11,12 +11,11 @@ class Voice;
 
 class VoiceGroup final
 {
-private:
   ALfloat m_gain;
   std::vector<std::weak_ptr<Voice>> m_voices;
 
 public:
-  explicit VoiceGroup(ALfloat gain = 1.0f)
+  explicit VoiceGroup(const ALfloat gain = 1.0f)
       : m_gain{gain}
   {
   }
diff --git a/src/audio/volume.h b/src/audio/volume.h
index cb22cefbd..9bccf850a 100644
--- a/src/audio/volume.h
+++ b/src/audio/volume.h
@@ -1,10 +1,12 @@
+#pragma once
+
 #include <AL/al.h>
 #include <algorithm>
 #include <cmath>
 
 namespace audio
 {
-inline ALfloat toLogarithmicVolumeExact(ALfloat v)
+inline ALfloat toLogarithmicVolumeExact(const ALfloat v)
 {
   return std::pow(1000.0f, std::max(0.0f, v) - 1);
 }
diff --git a/src/audio/wadstreamsource.cpp b/src/audio/wadstreamsource.cpp
index ed6f3c77f..96cee9978 100644
--- a/src/audio/wadstreamsource.cpp
+++ b/src/audio/wadstreamsource.cpp
@@ -9,7 +9,7 @@
 #include <cstdint>
 #include <filesystem>
 #include <fstream>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iosfwd>
 #include <memory>
 #include <stdexcept>
@@ -33,7 +33,7 @@ std::unique_ptr<FfmpegSubStreamStreamSource> createWadStream(const std::filesyst
   if(!wadFile->is_open())
     BOOST_THROW_EXCEPTION(std::runtime_error("Failed to open WAD file"));
 
-  wadFile->seekg(gsl::narrow<std::ifstream::off_type>(trackIndex * WADStride), std::ios::beg);
+  wadFile->seekg(gsl_lite::narrow<std::ifstream::off_type>(trackIndex * WADStride), std::ios::beg);
 
   std::array<char, WADNameLength> trackName{};
   wadFile->read(trackName.data(), WADNameLength);
@@ -51,4 +51,4 @@ std::unique_ptr<FfmpegSubStreamStreamSource> createWadStream(const std::filesyst
   wadFile->seekg(offset, std::ios::beg);
   return std::make_unique<FfmpegSubStreamStreamSource>(std::move(wadFile), offset, offset + length);
 }
-} // namespace audio
+} // namespace audio
\ No newline at end of file
diff --git a/src/core/angle.cpp b/src/core/angle.cpp
index de25c423c..3d0df30b1 100644
--- a/src/core/angle.cpp
+++ b/src/core/angle.cpp
@@ -9,7 +9,7 @@
 #include <cstdint>
 #include <glm/gtx/euler_angles.hpp>
 #include <glm/mat4x4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace core
 {
@@ -25,7 +25,7 @@ void TRRotationXY::deserialize(const serialization::Deserializer<engine::world::
 
 glm::mat4 TRRotationXY::toMatrix() const
 {
-  return glm::yawPitchRoll(-toRad(Y), toRad(X), 0.0f);
+  return glm::yawPitchRoll(-toRad(Y).get<>(), toRad(X).get<>(), 0.0f);
 }
 
 void TRRotation::serialize(const serialization::Serializer<engine::world::World>& ser) const
@@ -40,7 +40,7 @@ void TRRotation::deserialize(const serialization::Deserializer<engine::world::Wo
 
 glm::mat4 TRRotation::toMatrix() const
 {
-  return glm::yawPitchRoll(-toRad(Y), toRad(X), -toRad(Z));
+  return glm::yawPitchRoll(-toRad(Y).get<>(), toRad(X).get<>(), -toRad(Z).get<>());
 }
 
 TRRotationXY getVectorAngles(const Length& dx, const Length& dy, const Length& dz)
@@ -48,7 +48,8 @@ TRRotationXY getVectorAngles(const Length& dx, const Length& dy, const Length& d
   const auto y = angleFromAtan(dx, dz);
   const auto dxz = sqrt(dx * dx + dz * dz);
   auto x = angleFromAtan(dy, dxz);
-  if((dy < 0_len) == (toRad(x) < 0))
+  // ReSharper disable once CppRedundantParentheses
+  if((dy < 0_len) == (toRad(x) < 0_rad))
     x = -x;
 
   return TRRotationXY{x, y};
@@ -59,11 +60,11 @@ glm::mat4 fromPackedAngles(const uint8_t* angleData)
   const auto getAngle = [value = util::readUnaligned32LE(angleData)](const uint8_t n) -> Angle
   {
     BOOST_ASSERT(n < 3);
-    return auToAngle(gsl::narrow_cast<int16_t>(((value >> (10u * n)) & 0x3ffu) * 64));
+    return auToAngle(gsl_lite::narrow_cast<int16_t>(((value >> (10u * n)) & 0x3ffu) * 64));
   };
 
   const TRRotation r{getAngle(2), getAngle(1), getAngle(0)};
 
   return r.toMatrix();
 }
-} // namespace core
+} // namespace core
\ No newline at end of file
diff --git a/src/core/angle.h b/src/core/angle.h
index c520f66fc..d17725465 100644
--- a/src/core/angle.h
+++ b/src/core/angle.h
@@ -10,7 +10,7 @@
 #include <glm/ext/scalar_constants.hpp>
 #include <glm/fwd.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <limits>
 #include <optional>
 
@@ -21,34 +21,34 @@ class World;
 
 namespace core
 {
-[[nodiscard]] inline Angle angleFromRad(const float r)
+[[nodiscard]] inline Angle toAngle(const Radians& r)
 {
-  return Angle{gsl::narrow_cast<Angle::type>(r / 2 / glm::pi<float>() * FullRotation * AngleStorageScale)};
+  return Angle{gsl_lite::narrow_cast<Angle::type>(r.get<>() / 2 / glm::pi<float>() * FullRotation * AngleStorageScale)};
 }
 
 [[nodiscard]] inline Angle angleFromAtan(const float dx, const float dz)
 {
-  return angleFromRad(std::atan2(dx, dz));
+  return toAngle(Radians{std::atan2(dx, dz)});
 }
 
-[[nodiscard]] inline Angle angleFromDegrees(const float value) noexcept
+[[nodiscard]] inline Angle toAngle(const Degrees& value) noexcept
 {
-  return Angle{gsl::narrow_cast<Angle::type>(std::lround(value / 360 * FullRotation * AngleStorageScale))};
+  return Angle{gsl_lite::narrow_cast<Angle::type>(std::lround(value.get<>() / 360 * FullRotation * AngleStorageScale))};
 }
 
 [[nodiscard]] inline Angle angleFromAtan(const Length& dx, const Length& dz)
 {
-  return angleFromRad(std::atan2(dx.get<float>(), dz.get<float>()));
+  return toAngle(Radians{std::atan2(dx.get<float>(), dz.get<float>())});
 }
 
-[[nodiscard]] constexpr float toDegrees(const Angle& a) noexcept
+[[nodiscard]] constexpr Degrees toDegrees(const Angle& a) noexcept
 {
-  return a.get<float>() / AngleStorageScale * 360 / FullRotation;
+  return Degrees{a.get<float>() / AngleStorageScale * 360 / FullRotation};
 }
 
-[[nodiscard]] inline float toRad(const Angle& a) noexcept
+[[nodiscard]] inline Radians toRad(const Angle& a) noexcept
 {
-  return a.get<float>() / AngleStorageScale * glm::pi<float>() * 2 / FullRotation;
+  return Radians{a.get<float>() / AngleStorageScale * glm::pi<float>() * 2 / FullRotation};
 }
 
 [[nodiscard]] inline auto toAu(const Angle& a) noexcept
@@ -58,18 +58,17 @@ namespace core
 
 [[nodiscard]] inline float sin(const Angle& a) noexcept
 {
-  return std::sin(toRad(a));
+  return std::sin(toRad(a).get<>());
 }
 
 [[nodiscard]] inline float cos(const Angle& a) noexcept
 {
-  return std::cos(toRad(a));
+  return std::cos(toRad(a).get<>());
 }
 
 [[nodiscard]] inline Angle abs(const Angle& a) noexcept
 {
-  const auto tmp = Angle{std::abs(a.get())};
-  if(tmp >= 0_deg)
+  if(const auto tmp = Angle{std::abs(a.get())}; tmp >= 0_deg)
     return tmp;
 
   // abs(-180_deg) == -180_deg unfortunately
@@ -135,7 +134,7 @@ enum class Axis : uint8_t
 
 [[nodiscard]] inline std::optional<Angle> snapRotation(const Angle& angle, const Angle& margin)
 {
-  auto axis = axisFromAngle(angle, margin);
+  const auto axis = axisFromAngle(angle, margin);
   if(!axis)
     return {};
 
@@ -152,7 +151,7 @@ class TRRotation final
   TRRotation() = default;
 
   // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-  TRRotation(const Angle& x, const Angle& y, const Angle& z) noexcept
+  constexpr TRRotation(const Angle& x, const Angle& y, const Angle& z) noexcept
       : X{x}
       , Y{y}
       , Z{z}
@@ -161,12 +160,12 @@ class TRRotation final
 
   [[nodiscard]] glm::vec3 toDegrees() const
   {
-    return {core::toDegrees(X), core::toDegrees(Y), core::toDegrees(Z)};
+    return {core::toDegrees(X).get<>(), core::toDegrees(Y).get<>(), core::toDegrees(Z).get<>()};
   }
 
   [[nodiscard]] glm::vec3 toRenderSystem() const
   {
-    return {toRad(X), -toRad(Y), -toRad(Z)};
+    return {toRad(X).get<>(), -toRad(Y).get<>(), -toRad(Z).get<>()};
   }
 
   [[nodiscard]] TRRotation operator-(const TRRotation& rhs) const noexcept
@@ -185,6 +184,25 @@ class TRRotation final
   void deserialize(const serialization::Deserializer<engine::world::World>& ser);
 };
 
+[[nodiscard]] constexpr Angle lerp(const Angle& a, const Angle& b, const float alpha)
+{
+  constexpr auto halfCircle = static_cast<Angle::type>(static_cast<int64_t>(FullRotation) * AngleStorageScale / 2);
+  constexpr auto fullCircle = static_cast<Angle::type>(static_cast<int64_t>(FullRotation) * AngleStorageScale);
+
+  auto delta = b.get() - a.get();
+  if(delta > halfCircle)
+    delta -= fullCircle;
+  else if(delta < -halfCircle)
+    delta += fullCircle;
+
+  return Angle{static_cast<Angle::type>(a.get() + delta * alpha)};
+}
+
+[[nodiscard]] constexpr TRRotation lerp(const TRRotation& a, const TRRotation& b, const float alpha)
+{
+  return TRRotation{lerp(a.X, b.X, alpha), lerp(a.Y, b.Y, alpha), lerp(a.Z, b.Z, alpha)};
+}
+
 [[nodiscard]] extern glm::mat4 fromPackedAngles(const uint8_t* angleData);
 
 struct TRRotationXY
@@ -199,4 +217,4 @@ struct TRRotationXY
 };
 
 [[nodiscard]] extern TRRotationXY getVectorAngles(const Length& dx, const Length& dy, const Length& dz);
-} // namespace core
+} // namespace core
\ No newline at end of file
diff --git a/src/core/boundingbox.h b/src/core/boundingbox.h
index d4161e0ad..d9d2e66dc 100644
--- a/src/core/boundingbox.h
+++ b/src/core/boundingbox.h
@@ -8,30 +8,30 @@ namespace core
 {
 struct BoundingBox
 {
-  core::Interval<core::Length> x{0_len, 0_len};
-  core::Interval<core::Length> y{0_len, 0_len};
-  core::Interval<core::Length> z{0_len, 0_len};
+  Interval<Length> x{0_len, 0_len};
+  Interval<Length> y{0_len, 0_len};
+  Interval<Length> z{0_len, 0_len};
 
   explicit BoundingBox() = default;
 
-  explicit BoundingBox(const core::Length& minX,
+  explicit BoundingBox(const Length& minX,
                        // NOLINTNEXTLINE(*-easily-swappable-parameters)
-                       const core::Length& maxX,
-                       const core::Length& minY,
+                       const Length& maxX,
+                       const Length& minY,
                        // NOLINTNEXTLINE(*-easily-swappable-parameters)
-                       const core::Length& maxY,
-                       const core::Length& minZ,
-                       const core::Length& maxZ) noexcept
+                       const Length& maxY,
+                       const Length& minZ,
+                       const Length& maxZ) noexcept
       : x{minX, maxX}
       , y{minY, maxY}
       , z{minZ, maxZ}
   {
   }
 
-  explicit BoundingBox(const BoundingBox& a, const BoundingBox& b, const float bias)
-      : x{lerp(a.x.min, b.x.min, bias), lerp(a.x.max, b.x.max, bias)}
-      , y{lerp(a.y.min, b.y.min, bias), lerp(a.y.max, b.y.max, bias)}
-      , z{lerp(a.z.min, b.z.min, bias), lerp(a.z.max, b.z.max, bias)}
+  explicit BoundingBox(const BoundingBox& a, const BoundingBox& b, const float alpha)
+      : x{lerp(a.x.min, b.x.min, alpha), lerp(a.x.max, b.x.max, alpha)}
+      , y{lerp(a.y.min, b.y.min, alpha), lerp(a.y.max, b.y.max, alpha)}
+      , z{lerp(a.z.min, b.z.min, alpha), lerp(a.z.max, b.z.max, alpha)}
   {
   }
 
@@ -54,7 +54,7 @@ struct BoundingBox
     return x.contains(v.X) && y.contains(v.Y) && z.contains(v.Z);
   }
 
-  [[nodiscard]] bool intersectsExclusive(const core::BoundingBox& b) const noexcept
+  [[nodiscard]] bool intersectsExclusive(const BoundingBox& b) const noexcept
   {
     return x.intersectsExclusive(b.x) && y.intersectsExclusive(b.y) && z.intersectsExclusive(b.z);
   }
diff --git a/src/core/containeroffset.h b/src/core/containeroffset.h
index b5a644165..dc89faec4 100644
--- a/src/core/containeroffset.h
+++ b/src/core/containeroffset.h
@@ -4,7 +4,8 @@
 #include "tpl_helper.h"
 
 #include <boost/throw_exception.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <concepts>
+#include <gsl-lite/gsl-lite.hpp>
 #include <limits>
 #include <stdexcept>
 #include <type_traits>
@@ -12,11 +13,9 @@
 
 namespace core
 {
-template<typename OffsetType, typename... DataTypes>
+template<std::unsigned_integral OffsetType, typename... DataTypes>
 struct ContainerOffset
 {
-  static_assert(std::is_integral_v<OffsetType> && !std::is_signed_v<OffsetType>,
-                "Index type must be unsigned integer like");
   static_assert(sizeof...(DataTypes) > 0, "Must provide at least one bound type");
 
   using offset_type = OffsetType;
@@ -54,6 +53,7 @@ struct ContainerOffset
   {
     return v.at(index<T>());
   }
+
   template<typename T>
   void operator=(T value) const = delete;
 
@@ -64,11 +64,9 @@ struct ContainerOffset
   }
 };
 
-template<typename IndexType, typename... DataTypes>
+template<std::unsigned_integral IndexType, typename... DataTypes>
 struct ContainerIndex
 {
-  static_assert(std::is_integral_v<IndexType> && !std::is_signed_v<IndexType>,
-                "Index type must be unsigned integer like");
   static_assert(sizeof...(DataTypes) > 0, "Must provide at least one bound type");
 
   using index_type = IndexType;
@@ -86,28 +84,25 @@ struct ContainerIndex
   explicit ContainerIndex(T) = delete;
 
   template<typename T>
-  [[nodiscard]] constexpr auto
-    from(std::vector<T>& v) const -> std::enable_if_t<tpl::is_one_of_v<T, DataTypes...>, decltype(v.at(index))>
+  [[nodiscard]] constexpr T& from(std::vector<T>& v) const requires(tpl::is_one_of_v<T, DataTypes...>)
   {
     return v.at(index);
   }
 
   template<typename T>
-  [[nodiscard]] constexpr auto
-    from(const std::vector<T>& v) const -> std::enable_if_t<tpl::is_one_of_v<T, DataTypes...>, decltype(v.at(index))>
+  [[nodiscard]] constexpr const T& from(const std::vector<T>& v) const requires(tpl::is_one_of_v<T, DataTypes...>)
   {
     return v.at(index);
   }
 
   template<typename T>
-  [[nodiscard]] auto in(const std::vector<T>& v) const -> std::enable_if_t<tpl::is_one_of_v<T, DataTypes...>, bool>
+  [[nodiscard]] bool in(const std::vector<T>& v) const requires(tpl::is_one_of_v<T, DataTypes...>)
   {
     return index < v.size();
   }
 
   template<typename T>
-  [[nodiscard]] auto
-    exclusiveIn(const std::vector<T>& v) const noexcept -> std::enable_if_t<tpl::is_one_of_v<T, DataTypes...>, bool>
+  [[nodiscard]] bool exclusiveIn(const std::vector<T>& v) const noexcept requires(tpl::is_one_of_v<T, DataTypes...>)
   {
     return index <= v.size();
   }
@@ -138,14 +133,12 @@ struct ContainerIndex
       BOOST_THROW_EXCEPTION(std::out_of_range("Index addition causes overflow"));
 
     return ContainerIndex<LargerType, DataTypes...>{
-      gsl::narrow_cast<LargerType>(LargerType{index} + LargerType{delta})};
+      gsl_lite::narrow_cast<LargerType>(LargerType{index} + LargerType{delta})};
   }
 
-  template<typename T>
+  template<std::unsigned_integral T>
   // NOLINTNEXTLINE(cppcoreguidelines-c-copy-assignment-signature, misc-unconventional-assign-operator)
-  auto operator=(T value)
-    -> std::enable_if_t<std::is_integral_v<T> && !std::is_signed_v<T> && sizeof(T) <= sizeof(IndexType),
-                        ContainerIndex<IndexType, DataTypes...>&>
+  ContainerIndex& operator=(T value) requires(sizeof(T) <= sizeof(IndexType))
   {
     index = value;
     return *this;
@@ -158,11 +151,11 @@ struct ContainerIndex
   }
 
   template<typename TContext>
-  static ContainerIndex<IndexType, DataTypes...> create(const serialization::Serializer<TContext>& ser)
+  static ContainerIndex create(const serialization::Serializer<TContext>& ser)
   {
     index_type tmp = 0;
     ser(S_NV("index", tmp));
     return {tmp};
   }
 };
-} // namespace core
+} // namespace core
\ No newline at end of file
diff --git a/src/core/genericvec.h b/src/core/genericvec.h
index e63a10a6e..567a7454e 100644
--- a/src/core/genericvec.h
+++ b/src/core/genericvec.h
@@ -3,7 +3,7 @@
 #include "qs/quantity.h"
 
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace core
 {
@@ -18,13 +18,13 @@ struct UnderlyingType
 template<typename T, typename U>
 struct UnderlyingType<qs::quantity<T, U>>
 {
-  using type = typename qs::quantity<T, U>::type;
+  using type = qs::quantity<T, U>::type;
 };
 
 template<typename T, typename U>
 constexpr auto underlyingCast(const U& v)
 {
-  return gsl::narrow_cast<typename UnderlyingType<T>::type>(v);
+  return gsl_lite::narrow_cast<typename UnderlyingType<T>::type>(v);
 }
 } // namespace detail
 
@@ -50,8 +50,8 @@ struct GenericVec
   }
 
   constexpr GenericVec() noexcept = default;
-  constexpr GenericVec(const GenericVec<T>&) noexcept = default;
-  constexpr GenericVec(GenericVec<T>&&) noexcept = default;
+  constexpr GenericVec(const GenericVec&) noexcept = default;
+  constexpr GenericVec(GenericVec&&) noexcept = default;
 
   // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
   constexpr GenericVec(const T& x, const T& y, const T& z) noexcept
@@ -61,16 +61,16 @@ struct GenericVec
   {
   }
 
-  constexpr GenericVec<T>& operator=(const GenericVec<T>&) noexcept = default;
+  constexpr GenericVec& operator=(const GenericVec&) noexcept = default;
 
-  constexpr GenericVec<T>& operator=(GenericVec<T>&&) noexcept = default;
+  constexpr GenericVec& operator=(GenericVec&&) noexcept = default;
 
-  [[nodiscard]] constexpr GenericVec<T> operator-(const GenericVec<T>& rhs) const noexcept(noexcept(X - rhs.X))
+  [[nodiscard]] constexpr GenericVec operator-(const GenericVec& rhs) const noexcept(noexcept(X - rhs.X))
   {
     return {X - rhs.X, Y - rhs.Y, Z - rhs.Z};
   }
 
-  GenericVec<T>& operator-=(const GenericVec<T>& rhs) noexcept(noexcept(X -= rhs.X))
+  GenericVec& operator-=(const GenericVec& rhs) noexcept(noexcept(X -= rhs.X))
   {
     X -= rhs.X;
     Y -= rhs.Y;
@@ -84,18 +84,18 @@ struct GenericVec
     return GenericVec<decltype(X / n)>{X / n, Y / n, Z / n};
   }
 
-  template<typename U, typename V>
+  template<typename U, typename>
   [[nodiscard]] constexpr auto operator*(const U& n) const noexcept(noexcept(X * n))
   {
     return GenericVec<decltype(X * n)>{X * n, Y * n, Z * n};
   }
 
-  [[nodiscard]] constexpr GenericVec<T> operator+(const GenericVec<T>& rhs) const noexcept(noexcept(X + rhs.X))
+  [[nodiscard]] constexpr GenericVec operator+(const GenericVec& rhs) const noexcept(noexcept(X + rhs.X))
   {
     return {X + rhs.X, Y + rhs.Y, Z + rhs.Z};
   }
 
-  GenericVec<T>& operator+=(const GenericVec<T>& rhs) noexcept(noexcept(X += rhs.X))
+  GenericVec& operator+=(const GenericVec& rhs) noexcept(noexcept(X += rhs.X))
   {
     X += rhs.X;
     Y += rhs.Y;
@@ -105,7 +105,9 @@ struct GenericVec
 
   [[nodiscard]] glm::vec3 toRenderSystem() const noexcept
   {
-    return {gsl::narrow_cast<float>(X.get()), -gsl::narrow_cast<float>(Y.get()), -gsl::narrow_cast<float>(Z.get())};
+    return {gsl_lite::narrow_cast<float>(X.get()),
+            -gsl_lite::narrow_cast<float>(Y.get()),
+            -gsl_lite::narrow_cast<float>(Z.get())};
   }
 };
 
@@ -120,4 +122,4 @@ constexpr bool operator==(const GenericVec<T>& lhs, const GenericVec<T>& rhs) no
 {
   return lhs.X == rhs.X && lhs.Y == rhs.Y && lhs.Z == rhs.Z;
 }
-} // namespace core
+} // namespace core
\ No newline at end of file
diff --git a/src/core/i18n.cpp b/src/core/i18n.cpp
index 853147756..c0180ca23 100644
--- a/src/core/i18n.cpp
+++ b/src/core/i18n.cpp
@@ -3,7 +3,7 @@
 #include <boost/log/trivial.hpp>
 #include <clocale>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <libintl.h>
 #include <string>
 
@@ -67,4 +67,4 @@ void setLocale(const std::filesystem::path& poDir, const std::string& locale)
     BOOST_LOG_TRIVIAL(warning) << "Missing translations for " << locale;
   }
 }
-} // namespace core
+} // namespace core
\ No newline at end of file
diff --git a/src/core/i18n.h b/src/core/i18n.h
index 38d3aff6d..de532d7b5 100644
--- a/src/core/i18n.h
+++ b/src/core/i18n.h
@@ -26,29 +26,28 @@ inline const char* N_(const char* message) noexcept
 
 template<typename... Args>
 // NOLINTNEXTLINE(bugprone-reserved-identifier)
-inline std::string _(const char* message, Args&&... args)
+std::string _(const char* message, Args&&... args)
 {
   return (boost::format(_(message)) % ... % std::forward<Args>(args)).str();
 }
 
-inline const char* P_(const char* singular, const char* plural, unsigned long n) noexcept
+inline const char* P_(const char* singular, const char* plural, const unsigned long n) noexcept
 {
   return ngettext(singular, plural, n);
 }
 
 template<typename... Args>
 // NOLINTNEXTLINE(*-easily-swappable-parameters)
-inline std::string P_(const char* singular, const char* plural, unsigned long n, Args&&... args)
+std::string P_(const char* singular, const char* plural, const unsigned long n, Args&&... args)
 {
   return (boost::format(P_(singular, plural, n)) % ... % std::forward<Args>(args)).str();
 }
 
 // NOLINTNEXTLINE(*-easily-swappable-parameters)
-inline const char* dcpgettext(const char* domain, const char* msg_ctxt, const char* msgid, int category)
+inline const char* dcpgettext(const char* domain, const char* msg_ctxt, const char* msgid, const int category)
 {
-  auto msg_ctxt_id = std::string{msg_ctxt} + '\004' + msgid;
-  const auto translation = dcgettext(domain, msg_ctxt_id.c_str(), category);
-  if(msg_ctxt_id == translation)
+  const auto msg_ctxt_id = std::string{msg_ctxt} + '\004' + msgid;
+  if(const auto translation = dcgettext(domain, msg_ctxt_id.c_str(), category); msg_ctxt_id == translation)
   {
     return msgid;
   }
@@ -70,7 +69,7 @@ inline const char* pgettext(const char* msg_ctxt, const char* msgid)
 
 template<typename... Args>
 // NOLINTNEXTLINE(*-easily-swappable-parameters)
-inline std::string pgettext(const char* msg_ctxt, const char* msgid, Args&&... args)
+std::string pgettext(const char* msg_ctxt, const char* msgid, Args&&... args)
 {
   return (boost::format(pgettext(msg_ctxt, msgid)) % ... % std::forward<Args>(args)).str();
 }
@@ -81,12 +80,12 @@ inline const char* dcnpgettext(
   const char* msg_ctxt,
   const char* msgid,
   const char* msgid_plural,
-  unsigned long n,
-  int category)
+  const unsigned long n,
+  const int category)
 {
   const auto msg_ctxt_id = std::string{msg_ctxt} + '\004' + msgid;
-  const auto translation = dcngettext(domain, msg_ctxt_id.c_str(), msgid_plural, n, category);
-  if(translation == msg_ctxt_id || std::strcmp(translation, msgid_plural) == 0)
+  if(const auto translation = dcngettext(domain, msg_ctxt_id.c_str(), msgid_plural, n, category);
+     translation == msg_ctxt_id || std::strcmp(translation, msgid_plural) == 0)
   {
     return n == 1 ? msgid : msgid_plural;
   }
@@ -96,13 +95,13 @@ inline const char* dcnpgettext(
   }
 }
 
-inline const char*
-  dnpgettext(const char* domain, const char* msg_ctxt, const char* msgid, const char* msgid_plural, unsigned long n)
+inline const char* dnpgettext(
+  const char* domain, const char* msg_ctxt, const char* msgid, const char* msgid_plural, const unsigned long n)
 {
   return dcnpgettext(domain, msg_ctxt, msgid, msgid_plural, n, LC_MESSAGES);
 }
 
-inline const char* npgettext(const char* msg_ctxt, const char* msgid, const char* msgid_plural, unsigned long n)
+inline const char* npgettext(const char* msg_ctxt, const char* msgid, const char* msgid_plural, const unsigned long n)
 {
   return dnpgettext(textdomain(nullptr), msg_ctxt, msgid, msgid_plural, n);
 }
diff --git a/src/core/id.h b/src/core/id.h
index 85708b0a1..49f29934c 100644
--- a/src/core/id.h
+++ b/src/core/id.h
@@ -6,7 +6,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine
 {
@@ -17,10 +17,10 @@ enum class TR1SoundEffect;
 namespace core
 {
 /**
- * @brief A simple wrapper for specifying something without arithmetic support.
- * @tparam StorageType ID type
- * @tparam Tag Tag for avoiding mixing different IDs with the same storage type
- */
+* @brief A simple wrapper for specifying something without arithmetic support.
+* @tparam StorageType ID type
+* @tparam Tag Tag for avoiding mixing different IDs with the same storage type
+*/
 template<typename StorageType, typename Tag, typename... Enums>
 struct Id
 {
@@ -37,7 +37,7 @@ struct Id
   template<typename T>
   // cppcheck-suppress noExplicitConstructor
   constexpr Id(T value) // NOLINT(google-explicit-constructor)
-      : m_value{gsl::narrow_cast<type>(value)}
+      : m_value{gsl_lite::narrow_cast<type>(value)}
   {
     static_assert(sizeof...(Enums) == 0 || tpl::is_one_of_v<T, Enums...>, "Incompatible type");
   }
@@ -52,7 +52,7 @@ struct Id
   constexpr auto& operator=(T value)
   {
     static_assert(sizeof...(Enums) == 0 || tpl::is_one_of_v<T, Enums...>, "Incompatible type");
-    m_value = gsl::narrow_cast<type>(value);
+    m_value = gsl_lite::narrow_cast<type>(value);
     return *this;
   }
 
@@ -73,17 +73,17 @@ struct Id
     return static_cast<T>(m_value);
   }
 
-  [[nodiscard]] constexpr bool operator<(const Id<type, tag, Enums...>& r) const
+  [[nodiscard]] constexpr bool operator<(const Id& r) const
   {
     return get() < r.get();
   }
 
-  [[nodiscard]] constexpr bool operator==(const Id<type, tag, Enums...>& r) const
+  [[nodiscard]] constexpr bool operator==(const Id& r) const
   {
     return get() == r.get();
   }
 
-  [[nodiscard]] constexpr bool operator!=(const Id<type, tag, Enums...>& r) const
+  [[nodiscard]] constexpr bool operator!=(const Id& r) const
   {
     return get() != r.get();
   }
@@ -128,21 +128,21 @@ struct Id
   void serialize(const serialization::Serializer<TContext>& ser) const
   {
     ser.tag("id");
-    serialization::access<StorageType, false>::dispatch(m_value, ser);
+    serialization::access::dispatchSerialize(m_value, ser);
   }
 
   template<typename TContext>
   void deserialize(const serialization::Deserializer<TContext>& ser)
   {
     ser.tag("id");
-    serialization::access<StorageType, true>::dispatch(m_value, ser);
+    serialization::access::dispatchDeserialize(m_value, ser);
   }
 
   template<typename TContext>
-  [[nodiscard]] static Id<StorageType, Tag, Enums...> create(const serialization::Deserializer<TContext>& ser)
+  [[nodiscard]] static Id create(const serialization::Deserializer<TContext>& ser)
   {
     ser.tag("id");
-    return Id<StorageType, Tag, Enums...>{serialization::access<StorageType, true>::dispatch(ser)};
+    return Id{serialization::access::dispatchCreate<StorageType>(ser)};
   }
 
 private:
@@ -180,9 +180,9 @@ DECLARE_ID(ItemId, uint16_t);
 DECLARE_ID_E(TypeId, uint16_t, engine::TR1ItemId);
 DECLARE_ID_E(SoundEffectId, uint16_t, engine::TR1SoundEffect);
 
-[[nodiscard]] constexpr AnimStateId operator"" _as(unsigned long long value)
+[[nodiscard]] constexpr AnimStateId operator""_as(unsigned long long value)
 {
-  return AnimStateId{gsl::narrow_cast<AnimStateId::type>(value)};
+  return AnimStateId{gsl_lite::narrow_cast<AnimStateId::type>(value)};
 }
 } // namespace core
 
@@ -195,4 +195,4 @@ struct std::hash<core::Id<StorageType, Tag, Enums...>>
   {
     return hash<StorageType>{}(v.get());
   }
-};
+};
\ No newline at end of file
diff --git a/src/core/interval.h b/src/core/interval.h
index d28665b38..31cef52dd 100644
--- a/src/core/interval.h
+++ b/src/core/interval.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace core
 {
@@ -12,8 +12,8 @@ struct Interval final
   T max{};
 
   explicit Interval() = default;
-  Interval(const Interval<T>&) = default;
-  Interval(Interval<T>&&) noexcept = default;
+  Interval(const Interval&) = default;
+  Interval(Interval&&) noexcept = default;
 
   // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
   Interval(const T& min, const T& max) noexcept
@@ -22,21 +22,21 @@ struct Interval final
   {
   }
 
-  constexpr auto& operator=(const Interval<T>& rhs)
+  constexpr auto& operator=(const Interval& rhs)
   {
     min = rhs.min;
     max = rhs.max;
     return *this;
   }
 
-  [[nodiscard]] constexpr bool operator==(const Interval<T>& rhs) const
+  [[nodiscard]] constexpr bool operator==(const Interval& rhs) const
   {
     return min == rhs.min && max == rhs.max;
   }
 
   [[nodiscard]] constexpr auto operator+(const T& value) const
   {
-    return Interval<T>{min + value, max + value};
+    return Interval{min + value, max + value};
   }
 
   constexpr auto& operator+=(const T& value)
@@ -48,7 +48,7 @@ struct Interval final
 
   [[nodiscard]] constexpr auto operator-(const T& value) const
   {
-    return Interval<T>{min - value, max - value};
+    return Interval{min - value, max - value};
   }
 
   [[nodiscard]] constexpr bool isValid() const
@@ -82,19 +82,19 @@ struct Interval final
     return (min + max) / 2;
   }
 
-  [[nodiscard]] constexpr bool intersects(const Interval<T>& rhs) const
+  [[nodiscard]] constexpr bool intersects(const Interval& rhs) const
   {
     return min <= rhs.max && rhs.min <= max;
   }
 
-  [[nodiscard]] constexpr bool intersectsExclusive(const Interval<T>& rhs) const
+  [[nodiscard]] constexpr bool intersectsExclusive(const Interval& rhs) const
   {
     return min < rhs.max && rhs.min < max;
   }
 
   [[nodiscard]] constexpr auto narrowed(const T& value) const
   {
-    return Interval<T>{min + value, max - value};
+    return Interval{min + value, max - value};
   }
 
   [[nodiscard]] constexpr auto broadened(const T& value) const
@@ -102,24 +102,24 @@ struct Interval final
     return narrowed(-value);
   }
 
-  [[nodiscard]] constexpr auto intersect(const Interval<T>& rhs) const
+  [[nodiscard]] constexpr auto intersect(const Interval& rhs) const
   {
-    return Interval<T>{std::max(min, rhs.min), std::min(max, rhs.max)};
+    return Interval{std::max(min, rhs.min), std::min(max, rhs.max)};
   }
 
   [[nodiscard]] constexpr auto union_(const T& rhs) const
   {
-    return Interval<T>{std::min(min, rhs), std::max(max, rhs)};
+    return Interval{std::min(min, rhs), std::max(max, rhs)};
   }
 
-  [[nodiscard]] constexpr auto union_(const core::Interval<T>& rhs) const
+  [[nodiscard]] constexpr auto union_(const Interval& rhs) const
   {
-    return Interval<T>{std::min(min, rhs.min), std::max(max, rhs.max)};
+    return Interval{std::min(min, rhs.min), std::max(max, rhs.max)};
   }
 
   [[nodiscard]] constexpr auto sanitized() const
   {
-    return Interval<T>{std::min(min, max), std::max(min, max)};
+    return Interval{std::min(min, max), std::max(min, max)};
   }
 };
 
@@ -128,4 +128,4 @@ constexpr auto operator+(const T& lhs, const Interval<T>& rhs)
 {
   return Interval<T>{lhs + rhs.min, lhs + rhs.max};
 }
-} // namespace core
+} // namespace core
\ No newline at end of file
diff --git a/src/core/magic.h b/src/core/magic.h
index f2ea553f0..ff513faf3 100644
--- a/src/core/magic.h
+++ b/src/core/magic.h
@@ -5,7 +5,9 @@
 
 #include <chrono>
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <glm/trigonometric.hpp>
+#include <glm/vec3.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace core
 {
@@ -45,6 +47,8 @@ static_assert(DamageFallSpeedThreshold < DeadlyFallSpeedThreshold, "Constants wr
 constexpr auto MaxGrabbableGradient = 60_len;
 
 constexpr auto FrameRate = 30_frame / 1_sec;
+constexpr auto MenuFrameRate = 60_mframe / 1_sec;
+constexpr auto LogicRate = 30_tick / 1_sec;
 constexpr auto TimePerFrame
   = std::chrono::duration_cast<std::chrono::high_resolution_clock::duration>(std::chrono::seconds{1}) / FrameRate.get();
 
@@ -83,11 +87,20 @@ constexpr auto DiveRotationSpeedZ = 3_deg / 1_frame;
 
 constexpr auto FreeLookHeadTurnSpeed = 2_deg / 1_frame;
 
+constexpr auto HitAnimationLastFrame = 34_frame;
+
 constexpr size_t SavegameSlots = 99;
 
-constexpr Length operator"" _sectors(unsigned long long value) noexcept
+inline const auto DefaultFov = Radians{glm::radians(60.0f)};
+constexpr float DefaultNearPlane = 20.0f;
+constexpr float DefaultFarPlane = 20480.0f;
+constexpr Frame DefaultHealthBarTimeout = FrameRate * 1_sec * 4 / 3;
+
+constexpr auto AnimFramesPerTick = 1_frame / 1_tick;
+
+[[nodiscard]] constexpr Length operator""_sectors(unsigned long long value) noexcept
 {
-  return gsl::narrow_cast<Length::type>(value) * SectorSize;
+  return gsl_lite::narrow_cast<Length::type>(value) * SectorSize;
 }
 
 [[nodiscard]] constexpr auto sectorOf(const Length& l)
@@ -107,6 +120,9 @@ constexpr Length operator"" _sectors(unsigned long long value) noexcept
 {
   return sectorOf(l) * 1_sectors;
 }
+
+inline const auto RenderAxisRight = glm::vec3{1, 0, 0};
+inline const auto RenderAxisUp = glm::vec3{0, 1, 0};
 } // namespace core
 
-using core::operator""_sectors;
+using core::operator""_sectors;
\ No newline at end of file
diff --git a/src/core/py_module.h b/src/core/py_module.h
index 3c93b3f45..d6c7c7377 100644
--- a/src/core/py_module.h
+++ b/src/core/py_module.h
@@ -15,18 +15,18 @@ inline void initCoreModule(pybind11::module& m)
 {
   namespace py = pybind11;
 
-  py::class_<core::Length>(m, "Length")
-    .def(py::init<core::Length::type>())
-    .def_property_readonly("value", &core::Length::get<>);
+  py::class_<Length>(m, "Length")
+    .def(py::init<Length::type>())
+    .def_property_readonly("value", &Length::get<>);
 
-  py::class_<core::TRVec>(m, "Vec")
+  py::class_<TRVec>(m, "Vec")
     .def(py::init<>())
-    .def(py::init<core::Length, core::Length, core::Length>(), py::arg("x"), py::arg("y"), py::arg("z"))
-    .def_readwrite("x", &core::TRVec::X)
-    .def_readwrite("y", &core::TRVec::Y)
-    .def_readwrite("z", &core::TRVec::Z);
+    .def(py::init<Length, Length, Length>(), py::arg("x"), py::arg("y"), py::arg("z"))
+    .def_readwrite("x", &TRVec::X)
+    .def_readwrite("y", &TRVec::Y)
+    .def_readwrite("z", &TRVec::Z);
 
-  m.attr("QuarterSectorSize") = core::QuarterSectorSize.get();
-  m.attr("SectorSize") = core::SectorSize.get();
+  m.attr("QuarterSectorSize") = QuarterSectorSize.get();
+  m.attr("SectorSize") = SectorSize.get();
 }
 } // namespace core
diff --git a/src/core/test.cpp b/src/core/test.cpp
index 5f30b14a4..c9906d29f 100644
--- a/src/core/test.cpp
+++ b/src/core/test.cpp
@@ -46,11 +46,11 @@ BOOST_AUTO_TEST_CASE(test_angle_axis_with_margin)
 
 BOOST_AUTO_TEST_CASE(test_interval_construction)
 {
-  core::Interval<int> i1{};
+  constexpr core::Interval<int> i1{};
   BOOST_CHECK_EQUAL(i1.min, 0);
   BOOST_CHECK_EQUAL(i1.max, 0);
 
-  core::Interval<int> i2{3, 1};
+  const core::Interval i2{3, 1};
   BOOST_CHECK(!i2.isValid());
   BOOST_CHECK_EQUAL(i2.min, 3);
   BOOST_CHECK_EQUAL(i2.max, 1);
@@ -58,12 +58,12 @@ BOOST_AUTO_TEST_CASE(test_interval_construction)
 
 BOOST_AUTO_TEST_CASE(test_interval_validity)
 {
-  core::Interval<int> i{3, 1};
+  const core::Interval i{3, 1};
   BOOST_CHECK(!i.isValid());
   BOOST_CHECK_EQUAL(i.min, 3);
   BOOST_CHECK_EQUAL(i.max, 1);
 
-  auto i2 = i.sanitized();
+  const auto i2 = i.sanitized();
   BOOST_CHECK(i2.isValid());
   BOOST_CHECK_EQUAL(i2.min, 1);
   BOOST_CHECK_EQUAL(i2.max, 3);
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(test_interval_validity)
 
 BOOST_AUTO_TEST_CASE(test_interval_checks)
 {
-  core::Interval<int> i{1, 3};
+  const core::Interval i{1, 3};
   BOOST_CHECK(!i.contains(0));
   BOOST_CHECK(i.contains(1));
   BOOST_CHECK(i.contains(2));
@@ -87,46 +87,46 @@ BOOST_AUTO_TEST_CASE(test_interval_checks)
   BOOST_CHECK(i.intersects(i));
   BOOST_CHECK(i.intersectsExclusive(i));
 
-  core::Interval<int> i2{2, 5};
+  const core::Interval i2{2, 5};
   BOOST_CHECK(i.intersects(i2));
   BOOST_CHECK(i.intersectsExclusive(i2));
 
-  core::Interval<int> i3{3, 5};
+  const core::Interval i3{3, 5};
   BOOST_CHECK(i.intersects(i3));
   BOOST_CHECK(!i.intersectsExclusive(i3));
 }
 
 BOOST_AUTO_TEST_CASE(test_interval_queries)
 {
-  const core::Interval<int> i{0, 3};
+  const core::Interval i{0, 3};
   BOOST_CHECK_EQUAL(i.size(), 3);
   BOOST_CHECK_EQUAL(i.mid(), 1);
   BOOST_CHECK_EQUAL(i.clamp(-1), 0);
   BOOST_CHECK_EQUAL(i.clamp(1), 1);
   BOOST_CHECK_EQUAL(i.clamp(5), 3);
 
-  auto i2 = i.narrowed(1);
+  const auto i2 = i.narrowed(1);
   BOOST_CHECK_EQUAL(i2.min, 1);
   BOOST_CHECK_EQUAL(i2.max, 2);
 
-  auto i3 = i.broadened(1);
+  const auto i3 = i.broadened(1);
   BOOST_CHECK_EQUAL(i3.min, -1);
   BOOST_CHECK_EQUAL(i3.max, 4);
 
-  const core::Interval<int> i4{2, 5};
-  auto i5 = i.intersect(i4);
+  const core::Interval i4{2, 5};
+  const auto i5 = i.intersect(i4);
   BOOST_CHECK_EQUAL(i5.min, 2);
   BOOST_CHECK_EQUAL(i5.max, 3);
 
-  auto i6 = i4.intersect(i);
+  const auto i6 = i4.intersect(i);
   BOOST_CHECK_EQUAL(i6.min, 2);
   BOOST_CHECK_EQUAL(i6.max, 3);
 }
 
 BOOST_AUTO_TEST_CASE(test_interval_ops)
 {
-  const core::Interval<int> i{0, 3};
-  auto i2 = i + 5;
+  const core::Interval i{0, 3};
+  const auto i2 = i + 5;
   BOOST_CHECK_EQUAL(i2.min, 5);
   BOOST_CHECK_EQUAL(i2.max, 8);
 
@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE(test_interval_ops)
   BOOST_CHECK_EQUAL(i3.min, 10);
   BOOST_CHECK_EQUAL(i3.max, 13);
 
-  auto i4 = 20 + i;
+  const auto i4 = 20 + i;
   BOOST_CHECK_EQUAL(i4.min, 20);
   BOOST_CHECK_EQUAL(i4.max, 23);
 }
@@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE(test_bounding_box_validity)
 
 BOOST_AUTO_TEST_CASE(test_bounding_box_contains)
 {
-  core::BoundingBox bbox{{1_len, 2_len, 3_len}, {4_len, 5_len, 6_len}};
+  const core::BoundingBox bbox{{1_len, 2_len, 3_len}, {4_len, 5_len, 6_len}};
   BOOST_CHECK(bbox.x.isValid());
   BOOST_CHECK(bbox.y.isValid());
   BOOST_CHECK(bbox.z.isValid());
diff --git a/src/core/units.h b/src/core/units.h
index 8692453d0..01ca4b3b1 100644
--- a/src/core/units.h
+++ b/src/core/units.h
@@ -4,13 +4,21 @@
 
 #include <cmath>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace core
 {
+// Frame represents a game logic tick at fixed 30 Hz (not a render frame), but at the same time also an animation frame.
+// The engine runs game logic (physics, AI, input) at 30 FPS. Rendering can be uncapped and uses interpolation between logic frames.
 QS_DECLARE_QUANTITY(Frame, int32_t, "frame");
 QS_LITERAL_OP_ULL(Frame, _frame)
 
+QS_DECLARE_QUANTITY(MenuFrame, int32_t, "mframe");
+QS_LITERAL_OP_ULL(MenuFrame, _mframe)
+
+QS_DECLARE_QUANTITY(Tick, int32_t, "tick");
+QS_LITERAL_OP_ULL(Tick, _tick)
+
 QS_DECLARE_QUANTITY(Health, int32_t, "hp");
 QS_LITERAL_OP_ULL(Health, _hp)
 
@@ -18,6 +26,14 @@ QS_DECLARE_QUANTITY(Length, int32_t, "u");
 QS_LITERAL_OP_ULL(Length, _len)
 QS_LITERAL_OP_LD(Length, _len)
 
+QS_DECLARE_QUANTITY(Degrees, float, "deg");
+QS_LITERAL_OP_ULL(Degrees, _fdeg)
+QS_LITERAL_OP_LD(Degrees, _fdeg)
+
+QS_DECLARE_QUANTITY(Radians, float, "rad");
+QS_LITERAL_OP_ULL(Radians, _rad)
+QS_LITERAL_OP_LD(Radians, _rad)
+
 using Area = QS_COMBINE_UNITS(Length, *, Length);
 
 [[nodiscard]] inline Length sqrt(const Area& area) noexcept
@@ -25,11 +41,6 @@ using Area = QS_COMBINE_UNITS(Length, *, Length);
   return Length{static_cast<Length::type>(std::sqrt(area.get()))};
 }
 
-[[nodiscard]] constexpr Length lerp(const Length& a, const Length& b, float bias)
-{
-  return Length{static_cast<Length::type>(a.get() * (1 - bias) + b.get() * bias)};
-}
-
 QS_DECLARE_QUANTITY(Seconds, int32_t, "s");
 QS_LITERAL_OP_ULL(Seconds, _sec)
 
@@ -65,19 +76,19 @@ using RotationAcceleration = QS_COMBINE_UNITS(RotationSpeed, /, Frame);
 constexpr int32_t FullRotation = 1u << 16u;
 constexpr int32_t AngleStorageScale = 1u << 16u;
 
-[[nodiscard]] constexpr Angle auToAngle(int16_t value) noexcept
+[[nodiscard]] constexpr Angle auToAngle(const int16_t value) noexcept
 {
   return Angle{static_cast<Angle::type>(value) * AngleStorageScale};
 }
 
 [[nodiscard]] constexpr Angle operator"" _au(const unsigned long long value) noexcept
 {
-  return auToAngle(gsl::narrow_cast<int16_t>(value));
+  return auToAngle(gsl_lite::narrow_cast<int16_t>(value));
 }
 
 [[nodiscard]] constexpr Angle operator"" _deg(const unsigned long long value) noexcept
 {
-  return Angle{gsl::narrow_cast<Angle::type>(value * FullRotation / 360 * AngleStorageScale)};
+  return Angle{gsl_lite::narrow_cast<Angle::type>(value * FullRotation / 360 * AngleStorageScale)};
 }
 
 [[nodiscard]] constexpr Angle operator"" _deg(const long double value) noexcept
@@ -87,9 +98,13 @@ constexpr int32_t AngleStorageScale = 1u << 16u;
 } // namespace core
 
 using core::operator""_frame;
+using core::operator""_mframe;
+using core::operator""_tick;
 using core::operator""_hp;
 using core::operator""_len;
 using core::operator""_sec;
 using core::operator""_spd;
 using core::operator""_au;
 using core::operator""_deg;
+using core::operator""_fdeg;
+using core::operator""_rad;
\ No newline at end of file
diff --git a/src/core/vec.h b/src/core/vec.h
index d3a48d19f..cb3f76f6c 100644
--- a/src/core/vec.h
+++ b/src/core/vec.h
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 #include <cmath>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iosfwd>
 #include <tuple>
 
@@ -26,9 +26,9 @@ void deserialize(TRVec& v, const serialization::Deserializer<engine::world::Worl
 
 [[nodiscard]] inline Length distanceTo(const TRVec& lhs, const TRVec& rhs) noexcept
 {
-  const auto dx = gsl::narrow_cast<float>((lhs.X - rhs.X).get());
-  const auto dy = gsl::narrow_cast<float>((lhs.Y - rhs.Y).get());
-  const auto dz = gsl::narrow_cast<float>((lhs.Z - rhs.Z).get());
+  const auto dx = gsl_lite::narrow_cast<float>((lhs.X - rhs.X).get());
+  const auto dy = gsl_lite::narrow_cast<float>((lhs.Y - rhs.Y).get());
+  const auto dz = gsl_lite::narrow_cast<float>((lhs.Z - rhs.Z).get());
   return Length{static_cast<Length::type>(std::sqrt(dx * dx + dy * dy + dz * dz))};
 }
 
@@ -52,5 +52,10 @@ void deserialize(TRVec& v, const serialization::Deserializer<engine::world::Worl
   return sectorOf(a) == sectorOf(b);
 }
 
+[[nodiscard]] constexpr TRVec lerp(const TRVec& a, const TRVec& b, const float alpha)
+{
+  return TRVec{lerp(a.X, b.X, alpha), lerp(a.Y, b.Y, alpha), lerp(a.Z, b.Z, alpha)};
+}
+
 extern std::ostream& operator<<(std::ostream& stream, const TRVec& rhs);
-} // namespace core
+} // namespace core
\ No newline at end of file
diff --git a/src/croftengine.cpp b/src/croftengine.cpp
index 2ab127587..e4b4b14af 100644
--- a/src/croftengine.cpp
+++ b/src/croftengine.cpp
@@ -1,5 +1,6 @@
 #include "cpuinfo_x86.h"
 #include "engine/engine.h"
+#include "engine/levelloopresult.h"
 #include "engine/player.h"
 #include "engine/script/reflection.h"
 #include "engine/script/scriptengine.h"
@@ -17,7 +18,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iostream>
 #include <memory>
 #include <optional>
@@ -34,8 +35,7 @@
 
 namespace
 {
-
-const gsl::czstring logFormat = "[%TimeStamp% %Severity% %ThreadID%] %Message%";
+const auto logFormat = "[%TimeStamp% %Severity% %ThreadID%] %Message%";
 
 using sink_t = boost::log::sinks::synchronous_sink<boost::log::sinks::text_file_backend>;
 boost::shared_ptr<sink_t> logFileSink;
@@ -89,7 +89,7 @@ bool initCrashReporting()
       BOOST_LOG_TRIVIAL(fatal) << stackTraceEntry;
     });
   chillout.setCrashCallback(
-    [&chillout]()
+    [&chillout]
     {
       BOOST_LOG_TRIVIAL(fatal) << "Croft engine has crashed";
       chillout.backtrace();
@@ -134,7 +134,7 @@ void dumpCpuInfo()
   BOOST_LOG_TRIVIAL(info) << "CPU features: " << flags.str();
 }
 
-void runGame(const std::string& localeOverride, const std::string& gameflowId, bool borderlessFullscreen)
+void runGame(const std::string& localeOverride, const std::string& gameflowId, const bool borderlessFullscreen)
 {
   engine::Engine engine{findUserDataDir().value(),
                         findEngineDataDir().value(),
@@ -175,7 +175,7 @@ void runGame(const std::string& localeOverride, const std::string& gameflowId, b
 
   while(true)
   {
-    std::pair<engine::RunResult, std::optional<size_t>> runResult;
+    std::pair<engine::LevelLoopResult, std::optional<size_t>> runResult;
     switch(mode)
     {
     case Mode::Boot:
@@ -193,7 +193,8 @@ void runGame(const std::string& localeOverride, const std::string& gameflowId, b
       gsl_Assert(!doLoad);
       player = std::make_shared<engine::Player>();
       for(const auto& item : gameflow.getLaraHome())
-        runResult = engine.runLevelSequenceItem(*item, player, levelStartPlayer); // cppcheck-suppress useStlAlgorithm
+        runResult = engine.runLevelSequenceItem(*item, player, levelStartPlayer);
+      // cppcheck-suppress useStlAlgorithm
       break;
     case Mode::Game:
       if(doLoad)
@@ -201,7 +202,7 @@ void runGame(const std::string& localeOverride, const std::string& gameflowId, b
         player = std::make_shared<engine::Player>();
         levelStartPlayer = std::make_shared<engine::Player>();
         runResult = engine.runLevelSequenceItemFromSave(
-          *gsl::not_null{gameflow.getLevelSequence().at(levelSequenceIndex)}, loadSlot, player, levelStartPlayer);
+          *gsl_lite::not_null{gameflow.getLevelSequence().at(levelSequenceIndex)}, loadSlot, player, levelStartPlayer);
       }
       else
       {
@@ -215,7 +216,7 @@ void runGame(const std::string& localeOverride, const std::string& gameflowId, b
         levelStartPlayer = std::make_shared<engine::Player>(*player);
 
         runResult = engine.runLevelSequenceItem(
-          *gsl::not_null{gameflow.getLevelSequence().at(levelSequenceIndex)}, player, levelStartPlayer);
+          *gsl_lite::not_null{gameflow.getLevelSequence().at(levelSequenceIndex)}, player, levelStartPlayer);
       }
       break;
     }
@@ -226,32 +227,33 @@ void runGame(const std::string& localeOverride, const std::string& gameflowId, b
     switch(mode)
     {
     case Mode::Boot:
-      if(runResult.first == engine::RunResult::ExitGame)
+      if(runResult.first == engine::LevelLoopResult::ExitGame)
         return;
       mode = Mode::Title;
       break;
     case Mode::Title:
       switch(runResult.first)
       {
-      case engine::RunResult::ExitGame:
+      case engine::LevelLoopResult::ExitGame:
         return;
-      case engine::RunResult::NextLevel:
+      case engine::LevelLoopResult::NextLevel:
         levelSequenceIndex = 0;
         mode = Mode::Game;
         levelStartPlayer.reset();
         break;
-      case engine::RunResult::TitleLevel:
+      case engine::LevelLoopResult::TitleLevel:
+        engine.resetGameplayRules();
         mode = Mode::Title;
         break;
-      case engine::RunResult::LaraHomeLevel:
+      case engine::LevelLoopResult::LaraHomeLevel:
         mode = Mode::Gym;
         break;
-      case engine::RunResult::RequestLoad:
+      case engine::LevelLoopResult::RequestLoad:
         processLoadRequest(runResult.second);
         break;
-      case engine::RunResult::RestartLevel:
+      case engine::LevelLoopResult::RestartLevel:
         BOOST_THROW_EXCEPTION(std::runtime_error("level restart request while running title menu"));
-      case engine::RunResult::RequestLevel:
+      case engine::LevelLoopResult::RequestLevel:
       {
         gsl_Assert(runResult.second.has_value());
 
@@ -279,30 +281,31 @@ void runGame(const std::string& localeOverride, const std::string& gameflowId, b
     case Mode::Gym:
       switch(runResult.first)
       {
-      case engine::RunResult::ExitGame:
+      case engine::LevelLoopResult::ExitGame:
         return;
-      case engine::RunResult::NextLevel:
-      case engine::RunResult::TitleLevel:
+      case engine::LevelLoopResult::NextLevel:
+      case engine::LevelLoopResult::TitleLevel:
+        engine.resetGameplayRules();
         mode = Mode::Title;
         break;
-      case engine::RunResult::LaraHomeLevel:
+      case engine::LevelLoopResult::LaraHomeLevel:
         mode = Mode::Gym;
         break;
-      case engine::RunResult::RequestLoad:
+      case engine::LevelLoopResult::RequestLoad:
         processLoadRequest(runResult.second);
         break;
-      case engine::RunResult::RestartLevel:
+      case engine::LevelLoopResult::RestartLevel:
         BOOST_THROW_EXCEPTION(std::runtime_error("level restart request while running title menu"));
-      case engine::RunResult::RequestLevel:
+      case engine::LevelLoopResult::RequestLevel:
         BOOST_THROW_EXCEPTION(std::runtime_error("level selection request while running title menu"));
       }
       break;
     case Mode::Game:
       switch(runResult.first)
       {
-      case engine::RunResult::ExitGame:
+      case engine::LevelLoopResult::ExitGame:
         return;
-      case engine::RunResult::NextLevel:
+      case engine::LevelLoopResult::NextLevel:
         ++levelSequenceIndex;
         if(levelSequenceIndex >= gameflow.getLevelSequence().size())
         {
@@ -315,20 +318,21 @@ void runGame(const std::string& localeOverride, const std::string& gameflowId, b
           player->accumulateStats();
         }
         break;
-      case engine::RunResult::TitleLevel:
+      case engine::LevelLoopResult::TitleLevel:
+        engine.resetGameplayRules();
         mode = Mode::Title;
         break;
-      case engine::RunResult::LaraHomeLevel:
+      case engine::LevelLoopResult::LaraHomeLevel:
         mode = Mode::Gym;
         break;
-      case engine::RunResult::RequestLoad:
+      case engine::LevelLoopResult::RequestLoad:
         processLoadRequest(runResult.second);
         break;
-      case engine::RunResult::RestartLevel:
+      case engine::LevelLoopResult::RestartLevel:
         BOOST_ASSERT(levelStartPlayer != nullptr);
         player = std::make_shared<engine::Player>(*levelStartPlayer);
         break;
-      case engine::RunResult::RequestLevel:
+      case engine::LevelLoopResult::RequestLevel:
         BOOST_THROW_EXCEPTION(std::runtime_error("level selection request while in game"));
       }
       break;
@@ -338,7 +342,7 @@ void runGame(const std::string& localeOverride, const std::string& gameflowId, b
 } // namespace
 
 // NOLINTNEXTLINE(bugprone-exception-escape)
-int main(int argc, char** argv)
+int main(const int argc, char** argv)
 {
   const bool crashReportInitSuccess = initCrashReporting();
   boost::log::add_common_attributes();
@@ -393,4 +397,4 @@ int main(int argc, char** argv)
 
     runGame(localeOverride, gameflowId, borderlessFullscreen);
   }
-}
+}
\ No newline at end of file
diff --git a/src/dosbox-cdrom/binaryfile.cpp b/src/dosbox-cdrom/binaryfile.cpp
index ed740ad0d..d2e1884a7 100644
--- a/src/dosbox-cdrom/binaryfile.cpp
+++ b/src/dosbox-cdrom/binaryfile.cpp
@@ -6,7 +6,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 #include <iosfwd>
 #include <stdexcept>
@@ -23,13 +23,13 @@ BinaryFile::BinaryFile(const std::filesystem::path& filepath)
     BOOST_THROW_EXCEPTION(std::runtime_error("failed to open binary file"));
 }
 
-bool BinaryFile::read(const gsl::span<uint8_t>& buffer, const std::streampos& seek)
+bool BinaryFile::read(const gsl_lite::span<uint8_t>& buffer, const std::streampos& seek)
 {
-  std::fill(buffer.begin(), buffer.end(), uint8_t{0});
+  std::ranges::fill(buffer, uint8_t{0});
   m_file.seekg(seek, std::ios::beg);
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-  if(m_file.read(reinterpret_cast<char*>(buffer.data()), gsl::narrow<std::streamsize>(buffer.size()));
-     gsl::narrow<size_t>(m_file.gcount()) != buffer.size())
+  if(m_file.read(reinterpret_cast<char*>(buffer.data()), gsl_lite::narrow<std::streamsize>(buffer.size()));
+     gsl_lite::narrow<size_t>(m_file.gcount()) != buffer.size())
   {
     BOOST_LOG_TRIVIAL(error) << "read operation failed (partial read)";
     return false;
@@ -47,4 +47,4 @@ std::streamsize BinaryFile::size()
   m_file.seekg(0, std::ios::end);
   return m_file.tellg();
 }
-} // namespace image
+} // namespace image
\ No newline at end of file
diff --git a/src/dosbox-cdrom/binaryfile.h b/src/dosbox-cdrom/binaryfile.h
index b2ef266e2..8716b7d2b 100644
--- a/src/dosbox-cdrom/binaryfile.h
+++ b/src/dosbox-cdrom/binaryfile.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <filesystem>
 #include <fstream>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 #include <iosfwd>
 
@@ -14,8 +14,9 @@ class BinaryFile final
 public:
   explicit BinaryFile(const std::filesystem::path& filepath);
   BinaryFile() = delete;
-  bool read(const gsl::span<uint8_t>& buffer, const std::streampos& seek);
+  bool read(const gsl_lite::span<uint8_t>& buffer, const std::streampos& seek);
   std::streamsize size();
+
   [[nodiscard]] const auto& getFilepath() const
   {
     return m_filepath;
@@ -25,4 +26,4 @@ class BinaryFile final
   std::ifstream m_file;
   std::filesystem::path m_filepath;
 };
-} // namespace image
+} // namespace image
\ No newline at end of file
diff --git a/src/dosbox-cdrom/cueparser.cpp b/src/dosbox-cdrom/cueparser.cpp
index 6452e0bf3..e3e3b535a 100644
--- a/src/dosbox-cdrom/cueparser.cpp
+++ b/src/dosbox-cdrom/cueparser.cpp
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <filesystem>
 #include <fstream>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iosfwd>
 #include <optional>
 #include <regex>
@@ -14,34 +14,34 @@
 namespace cue
 {
 /*
- * From https://web.archive.org/web/20070614044112/http://www.goldenhawk.com/download/cdrwin.pdf, the available commands
- * are CATALOG, CDTEXTFILE, FILE, FLAGS, INDEX, ISRC, PERFORMER, POSTGAP, PREGAP, REM, SONGWRITER, TITLE, and TRACK.
- *
- * CATALOG and CDTEXTFILE can appear only once, anywhere in the file.
- * FILE has parameters $filename and $filetype. $filetype can be BINARY, MOTOROLA, AIFF, WAVE, or MP3. Must appear
- * before any other command.
- * FLAGS must appear after TRACK, and before INDEX. Only once per TRACK.
- * INDEX has parameters $number and $start. First INDEX must have $number 0 or 1, and the first INDEX of a TRACK must
- * have $start=00:00:00. Following INDEX commands must have sequential $number values. $number 0 is the pregap starting
- * time, $number 1 is the start time of the TRACK data.
- * ISRC must be after TRACK and before INDEX.
- * PERFORMER is global if before any TRACK command, otherwise it's for the current TRACK.
- * POSTGAP has a $length parameter in mm:ss:ff format. Only once per TRACK, must come after all INDEX commands.
- * PREGAP has a $length parameter in mm:ss:ff format. Only once per TRACK, must appear after TRACK, and before INDEX.
- * REM can appear anywhere, arbitrary times.
- * SONGWRITER is global if before any TRACK command, otherwise it's for the current TRACK.
- * TITLE is global if before any TRACK command, otherwise it's for the current TRACK.
- * TRACK has paremeters $number and $datatype. $datatype can be AUDIO, CDG, MODE1/2048, MODE1/2352, MODE2/2336,
- * MODE2/2352, CDI/2336, or CDI/2352. $number must be between 1 and 99 inclusive, and must be sequential. Must appear
- * at least once.
- *
- * Only considering data-defining commands, the cue sheet has the following format:
- * FILE $filename $filetype (only required before any TRACK)
- * TRACK $number $datatype (at least once, with the following commands applying to this TRACK)
- *   PREGAP $length (optional)
- *   INDEX $number $start (at least once)
- *   POSTGAP $length (optional)
- */
+* From https://web.archive.org/web/20070614044112/http://www.goldenhawk.com/download/cdrwin.pdf, the available commands
+* are CATALOG, CDTEXTFILE, FILE, FLAGS, INDEX, ISRC, PERFORMER, POSTGAP, PREGAP, REM, SONGWRITER, TITLE, and TRACK.
+*
+* CATALOG and CDTEXTFILE can appear only once, anywhere in the file.
+* FILE has parameters $filename and $filetype. $filetype can be BINARY, MOTOROLA, AIFF, WAVE, or MP3. Must appear
+* before any other command.
+* FLAGS must appear after TRACK, and before INDEX. Only once per TRACK.
+* INDEX has parameters $number and $start. First INDEX must have $number 0 or 1, and the first INDEX of a TRACK must
+* have $start=00:00:00. Following INDEX commands must have sequential $number values. $number 0 is the pregap starting
+* time, $number 1 is the start time of the TRACK data.
+* ISRC must be after TRACK and before INDEX.
+* PERFORMER is global if before any TRACK command, otherwise it's for the current TRACK.
+* POSTGAP has a $length parameter in mm:ss:ff format. Only once per TRACK, must come after all INDEX commands.
+* PREGAP has a $length parameter in mm:ss:ff format. Only once per TRACK, must appear after TRACK, and before INDEX.
+* REM can appear anywhere, arbitrary times.
+* SONGWRITER is global if before any TRACK command, otherwise it's for the current TRACK.
+* TITLE is global if before any TRACK command, otherwise it's for the current TRACK.
+* TRACK has paremeters $number and $datatype. $datatype can be AUDIO, CDG, MODE1/2048, MODE1/2352, MODE2/2336,
+* MODE2/2352, CDI/2336, or CDI/2352. $number must be between 1 and 99 inclusive, and must be sequential. Must appear
+* at least once.
+*
+* Only considering data-defining commands, the cue sheet has the following format:
+* FILE $filename $filetype (only required before any TRACK)
+* TRACK $number $datatype (at least once, with the following commands applying to this TRACK)
+*   PREGAP $length (optional)
+*   INDEX $number $start (at least once)
+*   POSTGAP $length (optional)
+*/
 
 std::optional<TrackCommand> parseTrack(const std::string& line)
 {
@@ -92,7 +92,7 @@ std::optional<IndexCommand> parseIndex(const std::string& line)
   static const std::regex indexRe{R"(\s*INDEX\s+0*(\d+)\s+(.+?)\s*)", std::regex_constants::icase};
   if(std::smatch m; std::regex_match(line, m, indexRe))
   {
-    if(auto frame = parseTime(m[2]); frame.has_value())
+    if(const auto frame = parseTime(m[2]); frame.has_value())
       return IndexCommand{std::stoul(m[1]), *frame};
   }
 
@@ -104,7 +104,7 @@ std::optional<size_t> parsePregap(const std::string& line)
   static const std::regex pregapRe{R"(\s*INDEX\s+(.+?)\s*)", std::regex_constants::icase};
   if(std::smatch m; std::regex_match(line, m, pregapRe))
   {
-    if(auto frame = parseTime(m[1]); frame.has_value())
+    if(const auto frame = parseTime(m[1]); frame.has_value())
       return frame;
   }
 
@@ -134,7 +134,7 @@ std::vector<Track> readCueSheet(const std::filesystem::path& filename)
   std::filesystem::path currentFile;
   std::string currentFiletype;
 
-  auto addTrack = [&result, &track, &currentFile, &currentFiletype]()
+  auto addTrack = [&result, &track, &currentFile, &currentFiletype]
   {
     if(!track.has_value())
       return;
@@ -147,7 +147,7 @@ std::vector<Track> readCueSheet(const std::filesystem::path& filename)
 
   for(std::string line; std::getline(cueSheet, line);)
   {
-    if(const auto trackCmd = cue::parseTrack(line); trackCmd.has_value())
+    if(const auto trackCmd = parseTrack(line); trackCmd.has_value())
     {
       BOOST_LOG_TRIVIAL(debug) << "Track command: index=" << trackCmd->index << ", mode2=" << trackCmd->mode2
                                << ", sectorSize=" << trackCmd->sectorSize << ", audio=" << trackCmd->audio;
@@ -157,7 +157,7 @@ std::vector<Track> readCueSheet(const std::filesystem::path& filename)
       track->filepath = currentFile;
       track->filetype = currentFiletype;
     }
-    else if(const auto indexCmd = cue::parseIndex(line); indexCmd.has_value())
+    else if(const auto indexCmd = parseIndex(line); indexCmd.has_value())
     {
       BOOST_LOG_TRIVIAL(debug) << "Index command: index=" << indexCmd->index << ", frame=" << indexCmd->frame;
       gsl_Assert(track.has_value());
@@ -172,21 +172,21 @@ std::vector<Track> readCueSheet(const std::filesystem::path& filename)
         track->start = indexCmd->frame;
       }
     }
-    else if(const auto fileCmd = cue::parseFile(line); fileCmd.has_value())
+    else if(const auto fileCmd = parseFile(line); fileCmd.has_value())
     {
       BOOST_LOG_TRIVIAL(debug) << "File command: filename=" << fileCmd->filename << ", type=" << fileCmd->type;
 
       currentFile = filename.parent_path() / fileCmd->filename;
       currentFiletype = fileCmd->type;
     }
-    else if(const auto pregapCmd = cue::parsePregap(line); pregapCmd.has_value())
+    else if(const auto pregapCmd = parsePregap(line); pregapCmd.has_value())
     {
       BOOST_LOG_TRIVIAL(debug) << "Pregap command: pregap=" << *pregapCmd;
       gsl_Assert(track.has_value());
 
       track->pregap = *pregapCmd;
     }
-    else if(cue::isIrrelevantCommand(line))
+    else if(isIrrelevantCommand(line))
     {
       BOOST_LOG_TRIVIAL(debug) << "Ignored line: " << line;
     }
@@ -201,4 +201,4 @@ std::vector<Track> readCueSheet(const std::filesystem::path& filename)
 
   return result;
 }
-} // namespace cue
+} // namespace cue
\ No newline at end of file
diff --git a/src/dosbox-cdrom/discfs.cpp b/src/dosbox-cdrom/discfs.cpp
index dc33a4323..32a9b3fa6 100644
--- a/src/dosbox-cdrom/discfs.cpp
+++ b/src/dosbox-cdrom/discfs.cpp
@@ -8,7 +8,7 @@
 #include <cstdint>
 #include <cstring>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <map>
 #include <stdexcept>
 #include <string>
@@ -78,8 +78,8 @@ void visitDir(DiscImage& drive,
         return;
       }
 
-      const auto nextAction = gsl::final_action(
-        [&]()
+      const auto nextAction = gsl_lite::final_action(
+        [&]
         {
           sectorOffset += record->LEN_DR;
           if(sectorOffset + offsetof(DirectoryRecord, identifierStart) > 2048)
@@ -120,7 +120,7 @@ void visitDir(DiscImage& drive,
       else
       {
         // file
-        gsl_Assert(fileMap.find(entryPath) == fileMap.end());
+        gsl_Assert(!fileMap.contains(entryPath));
         fileMap[entryPath] = FileSpan{record->extentLocation.le, record->dataLength.le};
       }
     }
@@ -129,7 +129,7 @@ void visitDir(DiscImage& drive,
 
 std::map<std::filesystem::path, FileSpan> getFiles(DiscImage& drive)
 {
-  std::vector<uint8_t> sectorBuffer = drive.readSector(16);
+  const std::vector<uint8_t> sectorBuffer = drive.readSector(16);
   if(sectorBuffer.empty())
     return {};
 
@@ -150,8 +150,8 @@ std::map<std::filesystem::path, FileSpan> getFiles(DiscImage& drive)
 std::vector<uint8_t> readFile(DiscImage& drive, const FileSpan& span)
 {
   auto buffer = drive.read(span.sector, span.size);
-  if(buffer.size() != gsl::narrow<size_t>(span.size))
+  if(buffer.size() != gsl_lite::narrow<size_t>(span.size))
     BOOST_THROW_EXCEPTION(std::runtime_error("could not read file"));
   return buffer;
 }
-} // namespace image
+} // namespace image
\ No newline at end of file
diff --git a/src/dosbox-cdrom/discimage.cpp b/src/dosbox-cdrom/discimage.cpp
index 7bcd9239a..171f1ce4c 100644
--- a/src/dosbox-cdrom/discimage.cpp
+++ b/src/dosbox-cdrom/discimage.cpp
@@ -34,7 +34,7 @@ namespace image
 DiscImage::~DiscImage() = default;
 
 // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-std::vector<uint8_t> DiscImage::read(size_t sector, size_t size)
+std::vector<uint8_t> DiscImage::read(size_t sector, const size_t size)
 {
   std::vector<uint8_t> buffer;
   buffer.reserve(size);
@@ -61,16 +61,16 @@ std::vector<uint8_t> DiscImage::read(size_t sector, size_t size)
 
 const Track* DiscImage::getTrackForSector(size_t sector)
 {
-  auto it = std::find_if(m_tracks.begin(),
-                         m_tracks.end(),
-                         [sector](const auto& track)
-                         {
-                           return track.startSector <= sector && sector < track.startSector + track.totalSectors;
-                         });
+  const auto it
+    = std::ranges::find_if(m_tracks,
+                           [sector](const auto& track)
+                           {
+                             return track.startSector <= sector && sector < track.startSector + track.totalSectors;
+                           });
   return it == m_tracks.end() ? nullptr : &*it;
 }
 
-std::vector<uint8_t> DiscImage::readSector(size_t sector)
+std::vector<uint8_t> DiscImage::readSector(const size_t sector)
 {
   const auto track = getTrackForSector(sector);
   if(track == nullptr)
diff --git a/src/dosbox-cdrom/formatutils.h b/src/dosbox-cdrom/formatutils.h
index 9cb248e05..927bacd60 100644
--- a/src/dosbox-cdrom/formatutils.h
+++ b/src/dosbox-cdrom/formatutils.h
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 
 namespace image
@@ -20,7 +20,7 @@ constexpr std::streamsize Mode2XaHeaderSize = 24;
 constexpr std::streamsize Mode2Form1UserDataSize = 2048;
 constexpr std::streamsize Mode2Form2UserDataSize = 2324;
 
-[[nodiscard]] inline std::streamsize getSectorHeaderSize(size_t sectorSize, bool mode2xa)
+[[nodiscard]] inline std::streamsize getSectorHeaderSize(const size_t sectorSize, const bool mode2xa)
 {
   if(sectorSize == Mode1UserDataSize)
     return 0;
@@ -30,7 +30,7 @@ constexpr std::streamsize Mode2Form2UserDataSize = 2324;
     return Mode1HeaderSize;
 }
 
-[[nodiscard]] inline std::streamsize getSectorUserDataSize(const gsl::span<uint8_t>& sector, bool mode2xa)
+[[nodiscard]] inline std::streamsize getSectorUserDataSize(const gsl_lite::span<uint8_t>& sector, const bool mode2xa)
 {
   if(!mode2xa)
     return Mode1UserDataSize;
@@ -39,4 +39,4 @@ constexpr std::streamsize Mode2Form2UserDataSize = 2324;
   gsl_Assert(sector[18] == 0x08 || sector[18] == 0x28);
   return sector[18] == 0x08 ? Mode2Form1UserDataSize : Mode2Form2UserDataSize;
 }
-} // namespace image
+} // namespace image
\ No newline at end of file
diff --git a/src/dosbox-cdrom/physicaltrackbuilder.cpp b/src/dosbox-cdrom/physicaltrackbuilder.cpp
index ca04f062e..f6fd04fc8 100644
--- a/src/dosbox-cdrom/physicaltrackbuilder.cpp
+++ b/src/dosbox-cdrom/physicaltrackbuilder.cpp
@@ -7,7 +7,7 @@
 #include <boost/throw_exception.hpp>
 #include <cstddef>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <stdexcept>
 #include <string>
@@ -101,4 +101,4 @@ bool PhysicalTrackBuilder::addTrack(const cue::Track& cueTrack, const std::share
   m_tracks.emplace_back(track);
   return true;
 }
-} // namespace image
+} // namespace image
\ No newline at end of file
diff --git a/src/dosbox-cdrom/physicaltrackbuilder.h b/src/dosbox-cdrom/physicaltrackbuilder.h
index 65106204a..f1ecbd488 100644
--- a/src/dosbox-cdrom/physicaltrackbuilder.h
+++ b/src/dosbox-cdrom/physicaltrackbuilder.h
@@ -34,6 +34,7 @@ class PhysicalTrackBuilder final
 {
 public:
   explicit PhysicalTrackBuilder(const std::filesystem::path& cueFilepath);
+
   [[nodiscard]] auto getTracks() &&
   {
     return std::move(m_tracks);
diff --git a/src/engine/ai/ai.cpp b/src/engine/ai/ai.cpp
index f1169d669..83217589b 100644
--- a/src/engine/ai/ai.cpp
+++ b/src/engine/ai/ai.cpp
@@ -24,7 +24,7 @@
 #include "serialization/serialization.h"
 #include "util/helpers.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <map>
 #include <memory>
 #include <optional>
@@ -33,8 +33,8 @@ namespace engine::ai
 {
 namespace
 {
-std::optional<ai::Mood>
-  getNewViolentMood(const EnemyLocation& enemyLocation, const ai::CreatureInfo& creatureInfo, bool isHit) noexcept
+std::optional<Mood>
+  getNewViolentMood(const EnemyLocation& enemyLocation, const CreatureInfo& creatureInfo, const bool isHit) noexcept
 {
   switch(creatureInfo.mood)
   {
@@ -58,10 +58,10 @@ std::optional<ai::Mood>
   return std::nullopt;
 }
 
-std::optional<ai::Mood> getNewNonViolentMood(const EnemyLocation& enemyLocation,
-                                             const ai::CreatureInfo& creatureInfo,
-                                             bool isHit,
-                                             bool hasTargetBox)
+std::optional<Mood> getNewNonViolentMood(const EnemyLocation& enemyLocation,
+                                         const CreatureInfo& creatureInfo,
+                                         const bool isHit,
+                                         const bool hasTargetBox)
 {
   switch(creatureInfo.mood)
   {
@@ -105,8 +105,11 @@ std::optional<ai::Mood> getNewNonViolentMood(const EnemyLocation& enemyLocation,
   return std::nullopt;
 }
 
-std::optional<ai::Mood> getNewMood(
-  const EnemyLocation& enemyLocation, const ai::CreatureInfo& creatureInfo, bool isHit, bool violent, bool hasTargetBox)
+std::optional<Mood> getNewMood(
+  const EnemyLocation& enemyLocation, const CreatureInfo& creatureInfo,
+                               const bool isHit,
+                               const bool violent,
+                               const bool hasTargetBox)
 {
   if(violent)
   {
@@ -129,7 +132,7 @@ void updateMood(const objects::AIAgent& aiAgent, const EnemyLocation& enemyLocat
   gsl_Assert(newTargetBox != nullptr);
   auto& lara = aiAgent.getWorld().getObjectManager().getLara();
   if(const auto box = lara.m_state.tryGetCurrentBox();
-     box == nullptr || creatureInfo.pathFinder.isUnreachable(gsl::not_null{box}))
+     box == nullptr || creatureInfo.pathFinder.isUnreachable(gsl_lite::not_null{box}))
   {
     // can't reach lara
     newTargetBox = nullptr;
@@ -151,7 +154,7 @@ void updateMood(const objects::AIAgent& aiAgent, const EnemyLocation& enemyLocat
   {
     creatureInfo.mood = Mood::Bored;
   }
-  else if(auto newMood
+  else if(const auto newMood
           = getNewMood(enemyLocation, creatureInfo, aiAgent.m_state.is_hit, violent, newTargetBox != nullptr);
           newMood.has_value())
   {
@@ -163,7 +166,7 @@ void updateMood(const objects::AIAgent& aiAgent, const EnemyLocation& enemyLocat
     if(originalMood == Mood::Attack)
     {
       gsl_Assert(creatureInfo.pathFinder.getTargetBox() != nullptr);
-      creatureInfo.pathFinder.setRandomSearchTarget(gsl::not_null{creatureInfo.pathFinder.getTargetBox()});
+      creatureInfo.pathFinder.setRandomSearchTarget(gsl_lite::not_null{creatureInfo.pathFinder.getTargetBox()});
     }
     // if we changed the mood, search for a new target, as the current one might have become invalid for the new mood
     newTargetBox = nullptr;
@@ -286,7 +289,7 @@ void updateMood(const objects::AIAgent& aiAgent, const EnemyLocation& enemyLocat
   if(newTargetBox != nullptr)
   {
     // we found a new target
-    creatureInfo.pathFinder.setTargetBox(gsl::not_null{newTargetBox});
+    creatureInfo.pathFinder.setTargetBox(gsl_lite::not_null{newTargetBox});
   }
 
   creatureInfo.pathFinder.calculateTarget(
@@ -345,8 +348,9 @@ EnemyLocation::EnemyLocation(const objects::AIAgent& aiAgent)
                       || aiAgent.getCreatureInfo()->pathFinder.isUnreachable(aiAgentBox);
   }
 
-  const gsl::not_null objectInfo{aiAgent.getWorld().getEngine().getScriptEngine().getGameflow().getObjectInfos().at(
-    aiAgent.m_state.type.get_as<TR1ItemId>())};
+  const gsl_lite::not_null objectInfo{
+    aiAgent.getWorld().getEngine().getScriptEngine().getGameflow().getObjectInfos().at(
+      aiAgent.m_state.type.get_as<TR1ItemId>())};
   const core::Length pivotLength{objectInfo->pivot_length};
   const auto pivotToLara = lara.m_state.location.position
                            - (aiAgent.m_state.location.position + util::pitch(pivotLength, aiAgent.m_state.rotation.Y));
@@ -365,7 +369,7 @@ EnemyLocation::EnemyLocation(const objects::AIAgent& aiAgent)
 
 CreatureInfo::CreatureInfo(const world::World& world,
                            const core::TypeId& type,
-                           const gsl::not_null<const world::Box*>& initialBox)
+                           const gsl_lite::not_null<const world::Box*>& initialBox)
 {
   const auto& objectInfo
     = *world.getEngine().getScriptEngine().getGameflow().getObjectInfos().at(type.get_as<TR1ItemId>());
@@ -392,4 +396,4 @@ void CreatureInfo::deserialize(const serialization::Deserializer<world::World>&
       S_NV("pathFinder", pathFinder),
       S_NV("target", target));
 }
-} // namespace engine::ai
+} // namespace engine::ai
\ No newline at end of file
diff --git a/src/engine/ai/ai.h b/src/engine/ai/ai.h
index 2b7d2879f..f1b093f6b 100644
--- a/src/engine/ai/ai.h
+++ b/src/engine/ai/ai.h
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <boost/throw_exception.hpp>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <limits>
 #include <memory>
 #include <ostream>
@@ -88,7 +88,9 @@ struct CreatureInfo
   PathFinder pathFinder;
   core::TRVec target;
 
-  CreatureInfo(const world::World& world, const core::TypeId& type, const gsl::not_null<const world::Box*>& initialBox);
+  CreatureInfo(const world::World& world,
+               const core::TypeId& type,
+               const gsl_lite::not_null<const world::Box*>& initialBox);
 
   // serialization constructor
   explicit CreatureInfo() = default;
@@ -110,4 +112,4 @@ void serialize(const std::unique_ptr<CreatureInfo>& data, const serialization::S
 void deserialize(std::unique_ptr<CreatureInfo>& data, const serialization::Deserializer<world::World>& ser);
 
 void updateMood(const objects::AIAgent& aiAgent, const EnemyLocation& enemyLocation, bool violent);
-} // namespace engine::ai
+} // namespace engine::ai
\ No newline at end of file
diff --git a/src/engine/ai/pathfinder.cpp b/src/engine/ai/pathfinder.cpp
index 4e7dfb0ad..0049fd2b9 100644
--- a/src/engine/ai/pathfinder.cpp
+++ b/src/engine/ai/pathfinder.cpp
@@ -23,7 +23,7 @@
 #include <boost/assert.hpp>
 #include <cstdint>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <utility>
 
 namespace engine::ai
@@ -41,7 +41,7 @@ template<typename T>
     return value;
 }
 
-struct MovementCalculator
+struct SteeringCalculator
 {
   static constexpr auto Margin = 1_sectors / 2;
 
@@ -52,53 +52,59 @@ struct MovementCalculator
   // NOLINTNEXTLINE(hicpp-signed-bitwise)
   static constexpr uint8_t CanMoveAllDirs = CanMoveXNeg | CanMoveXPos | CanMoveZNeg | CanMoveZPos;
 
-  explicit MovementCalculator(const core::TRVec& startPos)
-      : startPos{startPos}
-      , moveTarget{startPos}
+  explicit SteeringCalculator(const core::TRVec& origin)
+      : m_origin{origin}
+      , m_target{origin}
   {
   }
 
-  core::TRVec startPos;
-  core::TRVec moveTarget;
-  bool frozenRanges = false;
-  uint8_t moveDirs = CanMoveAllDirs;
-  core::Interval<core::Length> xRange{0_len, 0_len};
-  core::Interval<core::Length> zRange{0_len, 0_len};
-
-  bool calculate(const gsl::not_null<const world::Box*>& startBox,
-                 bool isFlying,
-                 const world::Box* goalBox,
-                 const core::TRVec& goalPos,
-                 const std::function<const world::Box*(const gsl::not_null<const world::Box*>& box)>& getNextPathBox,
-                 const std::function<bool(const world::Box& box)>& canVisit)
+  core::TRVec m_origin;       // The current position of the entity
+  core::TRVec m_target;       // The calculated steering target
+  bool m_isDiverging = false; // True if the shortcut path is restricted by box boundaries
+  uint8_t m_directionMask = CanMoveAllDirs;
+  core::Interval<core::Length> m_allowedXRange{0_len, 0_len};
+  core::Interval<core::Length> m_allowedZRange{0_len, 0_len};
+
+  bool calculate(
+    const gsl_lite::not_null<const world::Box*>& startBox,
+    const bool isFlying,
+    const world::Box* goalBox,
+    const core::TRVec& goalPos,
+    const std::function<const world::Box*(const gsl_lite::not_null<const world::Box*>& box)>& getNextBoxInPath,
+    const std::function<bool(const world::Box& box)>& isBoxVisitable)
   {
     auto box = startBox;
-    BOOST_ASSERT(startBox->xInterval.contains(startPos.X));
-    BOOST_ASSERT(startBox->zInterval.contains(startPos.Z));
-    xRange = {0_len, 0_len};
-    zRange = {0_len, 0_len};
-
-    moveTarget = startPos;
-    frozenRanges = false;
-    moveDirs = CanMoveAllDirs;
+    BOOST_ASSERT(startBox->xInterval.contains(m_origin.X));
+    BOOST_ASSERT(startBox->zInterval.contains(m_origin.Z));
+    m_allowedXRange = {0_len, 0_len};
+    m_allowedZRange = {0_len, 0_len};
+
+    m_target = m_origin;
+    m_isDiverging = false;
+    m_directionMask = CanMoveAllDirs;
     while(true)
     {
       if(isFlying)
       {
-        moveTarget.Y = std::min(moveTarget.Y, box->floor - 1_sectors);
+        m_target.Y = std::min(m_target.Y, box->floor - 1_sectors);
       }
       else
       {
-        moveTarget.Y = std::min(moveTarget.Y, box->floor);
+        m_target.Y = std::min(m_target.Y, box->floor);
       }
 
-      if(box->xInterval.contains(startPos.X) && box->zInterval.contains(startPos.Z))
+      if(box->xInterval.contains(m_origin.X) && box->zInterval.contains(m_origin.Z))
       {
-        xRange = box->xInterval;
-        zRange = box->zInterval;
+        // Scenario 1: We are still within the boundaries of the current box.
+        // The allowed range for shortcutting is the box itself.
+        m_allowedXRange = box->xInterval;
+        m_allowedZRange = box->zInterval;
       }
       else if(tryMove(*box))
       {
+        // Scenario 2: We are trying to shortcut through a box that doesn't contain the origin.
+        // If tryMove returns true, it means we've reached a point where we must change direction
+        // or stop shortcutting because the next box is not in a straight line.
         return true;
       }
 
@@ -109,11 +115,11 @@ struct MovementCalculator
         return true;
       }
 
-      const auto nextBox = getNextPathBox(box);
-      if(nextBox == nullptr || !canVisit(*nextBox))
+      const auto nextBox = getNextBoxInPath(box);
+      if(nextBox == nullptr || !isBoxVisitable(*nextBox))
         break;
 
-      box = gsl::not_null{nextBox};
+      box = gsl_lite::not_null{nextBox};
     }
 
     calculateFinalIncompleteMove(*box, isFlying);
@@ -123,23 +129,23 @@ struct MovementCalculator
 
   bool tryMove(const world::Box& box)
   {
-    if(startPos.Z < box.zInterval.min)
+    if(m_origin.Z < box.zInterval.min)
     {
       if(tryMoveZPos(box))
         return true;
     }
-    else if(startPos.Z > box.zInterval.max)
+    else if(m_origin.Z > box.zInterval.max)
     {
       if(tryMoveZNeg(box))
         return true;
     }
 
-    if(startPos.X < box.xInterval.min)
+    if(m_origin.X < box.xInterval.min)
     {
       if(tryMoveXPos(box))
         return true;
     }
-    else if(startPos.X > box.xInterval.max)
+    else if(m_origin.X > box.xInterval.max)
     {
       if(tryMoveXNeg(box))
         return true;
@@ -150,15 +156,15 @@ struct MovementCalculator
 
   bool finishInvalid()
   {
-    if(!frozenRanges && moveDirs == CanMoveAllDirs)
+    if(!m_isDiverging && m_directionMask == CanMoveAllDirs)
     {
-      // We reached the maximum possible +Z, and we have no primary direction.
-      frozenRanges = true;
+      // We haven't established a primary movement direction yet.
+      m_isDiverging = true;
       return false;
     }
     else
     {
-      // We didn't go in primary direction. We can call it a day.
+      // We cannot shortcut in the primary direction anymore.
       return true;
     }
   }
@@ -166,38 +172,35 @@ struct MovementCalculator
   bool tryMoveZPos(const world::Box& box)
   {
     // Try to move to +Z, as we're outside the box.
-    if((moveDirs & CanMoveZPos) && box.xInterval.contains(startPos.X))
+    if((m_directionMask & CanMoveZPos) && box.xInterval.contains(m_origin.X))
     {
-      // Scenario 1: We can move to +Z, *and* the new position will have a valid X value. This means we move as little
-      // as we can into the new box.
+      // Scenario 1: We can move to +Z, *and* the current X position is within the new box's X range.
+      // This allows us to extend the current straight-line shortcut.
 
-      // The "max" is to ensure that it won't go to -Z, as the box's Z range may contain the moveTarget Z.
-      moveTarget.Z = std::max(moveTarget.Z, box.zInterval.max - Margin);
-      if(frozenRanges)
+      // The "max" is to ensure that it won't go to -Z, as the box's Z range may contain the m_target Z.
+      m_target.Z = std::max(m_target.Z, box.zInterval.max - Margin);
+      if(m_isDiverging)
       {
         return true;
       }
 
       // We narrow down the valid X values, as the new box may form a narrower passage.
-      xRange = xRange.intersect(box.xInterval);
+      m_allowedXRange = m_allowedXRange.intersect(box.xInterval);
 
       // Now remember our "primary" movement direction, i.e. the initial direction we moved to.
-      moveDirs = CanMoveZPos;
+      m_directionMask = CanMoveZPos;
     }
     else
     {
-      // Scenario 2: We cannot move to +Z, *or* the new position won't have a valid X value. This means we're not
-      // moving in the primary direction anymore, or our X value will become invalid, or both.
-
-      if(moveDirs == CanMoveZPos)
+      // Scenario 2: We cannot move straight to +Z anymore.
+      if(m_directionMask == CanMoveZPos)
       {
-        // We followed our primary direction, so we try to go further in that direction. This usually happens on stairs
-        // or slopes that are made of a line of linearly laid out boxes.
+        // If this was our primary direction, keep going for now (e.g. following a curved corridor).
         return false;
       }
 
-      // Move to the virtual wall of our currently allowed movement area.
-      moveTarget.Z = zRange.max - Margin;
+      // Move to the edge of our currently allowed area.
+      m_target.Z = m_allowedZRange.max - Margin;
 
       return finishInvalid();
     }
@@ -207,26 +210,26 @@ struct MovementCalculator
 
   bool tryMoveZNeg(const world::Box& box)
   {
-    if((moveDirs & CanMoveZNeg) && box.xInterval.contains(startPos.X))
+    if((m_directionMask & CanMoveZNeg) && box.xInterval.contains(m_origin.X))
     {
-      moveTarget.Z = std::min(moveTarget.Z, box.zInterval.min + Margin);
-      if(frozenRanges)
+      m_target.Z = std::min(m_target.Z, box.zInterval.min + Margin);
+      if(m_isDiverging)
       {
         return true;
       }
 
-      xRange = xRange.intersect(box.xInterval);
+      m_allowedXRange = m_allowedXRange.intersect(box.xInterval);
 
-      moveDirs = CanMoveZNeg;
+      m_directionMask = CanMoveZNeg;
     }
     else
     {
-      if(moveDirs == CanMoveZNeg)
+      if(m_directionMask == CanMoveZNeg)
       {
         return false;
       }
 
-      moveTarget.Z = zRange.min + Margin;
+      m_target.Z = m_allowedZRange.min + Margin;
 
       return finishInvalid();
     }
@@ -236,26 +239,26 @@ struct MovementCalculator
 
   bool tryMoveXPos(const world::Box& box)
   {
-    if((moveDirs & CanMoveXPos) && box.zInterval.contains(startPos.Z))
+    if((m_directionMask & CanMoveXPos) && box.zInterval.contains(m_origin.Z))
     {
-      moveTarget.X = std::max(moveTarget.X, box.xInterval.max - Margin);
-      if(frozenRanges)
+      m_target.X = std::max(m_target.X, box.xInterval.max - Margin);
+      if(m_isDiverging)
       {
         return true;
       }
 
-      zRange = zRange.intersect(box.zInterval);
+      m_allowedZRange = m_allowedZRange.intersect(box.zInterval);
 
-      moveDirs = CanMoveXPos;
+      m_directionMask = CanMoveXPos;
     }
     else
     {
-      if(moveDirs == CanMoveXPos)
+      if(m_directionMask == CanMoveXPos)
       {
         return false;
       }
 
-      moveTarget.X = xRange.max - Margin;
+      m_target.X = m_allowedXRange.max - Margin;
 
       return finishInvalid();
     }
@@ -265,26 +268,26 @@ struct MovementCalculator
 
   bool tryMoveXNeg(const world::Box& box)
   {
-    if((moveDirs & CanMoveXNeg) && box.zInterval.contains(startPos.Z))
+    if((m_directionMask & CanMoveXNeg) && box.zInterval.contains(m_origin.Z))
     {
-      moveTarget.X = std::min(moveTarget.X, box.xInterval.min + Margin);
-      if(frozenRanges)
+      m_target.X = std::min(m_target.X, box.xInterval.min + Margin);
+      if(m_isDiverging)
       {
         return true;
       }
 
-      zRange = zRange.intersect(box.zInterval);
+      m_allowedZRange = m_allowedZRange.intersect(box.zInterval);
 
-      moveDirs = CanMoveXNeg;
+      m_directionMask = CanMoveXNeg;
     }
     else
     {
-      if(moveDirs == CanMoveXNeg)
+      if(m_directionMask == CanMoveXNeg)
       {
         return false;
       }
 
-      moveTarget.X = xRange.min + Margin;
+      m_target.X = m_allowedXRange.min + Margin;
 
       return finishInvalid();
     }
@@ -298,64 +301,64 @@ struct MovementCalculator
   void calculateFinalMove(const world::Box& box, const core::TRVec& target)
   {
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    if(moveDirs & (CanMoveZNeg | CanMoveZPos))
+    if(m_directionMask & (CanMoveZNeg | CanMoveZPos))
     {
-      moveTarget.Z = target.Z;
+      m_target.Z = target.Z;
     }
-    else if(!frozenRanges)
+    else if(!m_isDiverging)
     {
-      moveTarget.Z = uncheckedClamp(moveTarget.Z, box.zInterval.narrowed(Margin));
+      m_target.Z = uncheckedClamp(m_target.Z, box.zInterval.narrowed(Margin));
     }
-    gsl_Assert(box.zInterval.contains(moveTarget.Z));
+    gsl_Assert(box.zInterval.contains(m_target.Z));
 
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    if(moveDirs & (CanMoveXNeg | CanMoveXPos))
+    if(m_directionMask & (CanMoveXNeg | CanMoveXPos))
     {
-      moveTarget.X = target.X;
+      m_target.X = target.X;
     }
-    else if(!frozenRanges)
+    else if(!m_isDiverging)
     {
-      moveTarget.X = uncheckedClamp(moveTarget.X, box.xInterval.narrowed(Margin));
+      m_target.X = uncheckedClamp(m_target.X, box.xInterval.narrowed(Margin));
     }
-    gsl_Assert(box.xInterval.contains(moveTarget.X));
+    gsl_Assert(box.xInterval.contains(m_target.X));
 
-    moveTarget.Y = target.Y;
+    m_target.Y = target.Y;
   }
 
   /**
-   * Calculate the final movement if we cannot directly reach the target. Depending on the current state, will
-   * randomise the #moveTarget.
+   * Calculate the final movement if we cannot directly reach the target.
+   * Depending on the current state, will randomise the target position within the current box.
    */
-  void calculateFinalIncompleteMove(const world::Box& box, bool isFlying)
+  void calculateFinalIncompleteMove(const world::Box& box, const bool isFlying)
   {
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    if(moveDirs & (CanMoveZNeg | CanMoveZPos))
+    if(m_directionMask & (CanMoveZNeg | CanMoveZPos))
     {
       const auto range = box.zInterval.size() - 2 * Margin;
-      moveTarget.Z = util::rand15(range) + box.zInterval.min + Margin;
+      m_target.Z = util::rand15(range) + box.zInterval.min + Margin;
     }
-    else if(!frozenRanges)
+    else if(!m_isDiverging)
     {
-      moveTarget.Z = uncheckedClamp(moveTarget.Z, box.zInterval.narrowed(Margin));
+      m_target.Z = uncheckedClamp(m_target.Z, box.zInterval.narrowed(Margin));
     }
-    gsl_Assert(box.zInterval.contains(moveTarget.Z));
+    gsl_Assert(box.zInterval.contains(m_target.Z));
 
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    if(moveDirs & (CanMoveXNeg | CanMoveXPos))
+    if(m_directionMask & (CanMoveXNeg | CanMoveXPos))
     {
       const auto range = box.xInterval.size() - 2 * Margin;
-      moveTarget.X = util::rand15(range) + box.xInterval.min + Margin;
+      m_target.X = util::rand15(range) + box.xInterval.min + Margin;
     }
-    else if(!frozenRanges)
+    else if(!m_isDiverging)
     {
-      moveTarget.X = uncheckedClamp(moveTarget.X, box.xInterval.narrowed(Margin));
+      m_target.X = uncheckedClamp(m_target.X, box.xInterval.narrowed(Margin));
     }
-    gsl_Assert(box.xInterval.contains(moveTarget.X));
+    gsl_Assert(box.xInterval.contains(m_target.X));
 
     if(isFlying)
-      moveTarget.Y = box.floor - 384_len;
+      m_target.Y = box.floor - 384_len;
     else
-      moveTarget.Y = box.floor;
+      m_target.Y = box.floor;
   }
 };
 } // namespace
@@ -363,17 +366,17 @@ struct MovementCalculator
 bool PathFinder::calculateTarget(const world::World& world,
                                  core::TRVec& moveTarget,
                                  const core::TRVec& startPos,
-                                 const gsl::not_null<const world::Box*>& startBox)
+                                 const gsl_lite::not_null<const world::Box*>& startBox)
 {
   gsl_Expects(m_targetBox != nullptr);
   gsl_Expects(m_targetBox->xInterval.contains(m_target.X));
   gsl_Expects(m_targetBox->zInterval.contains(m_target.Z));
   gsl_Expects(startBox->xInterval.contains(startPos.X));
   gsl_Expects(startBox->zInterval.contains(startPos.Z));
-  expandNodes(world);
+  expandPathGraph(world);
 
-  MovementCalculator calc{startPos};
-  auto result = calc.calculate(
+  SteeringCalculator calc{startPos};
+  const auto result = calc.calculate(
     startBox,
     isFlying(),
     m_targetBox,
@@ -386,98 +389,98 @@ bool PathFinder::calculateTarget(const world::World& world,
     {
       return canVisit(box);
     });
-  moveTarget = calc.moveTarget;
+  moveTarget = calc.m_target;
   return result;
 }
 
-void PathFinder::expandNodes(const world::World& world)
+void PathFinder::expandPathGraph(const world::World& world)
 {
   const auto zoneRef = world::Box::getZoneRef(world.roomsAreSwapped(), isFlying(), m_step);
 
-  static constexpr uint8_t MaxExpansions = 50;
+  static constexpr uint8_t MaxExpansionsPerTick = 50;
 
-  for(uint8_t i = 0; i < MaxExpansions && !m_expansions.empty(); ++i)
+  for(uint8_t i = 0; i < MaxExpansionsPerTick && !m_expansions.empty(); ++i)
   {
-    // this does a backwards search from the target (usually Lara) to the source (usually a baddie), as the expansions
-    // are initialised with the target when reset.
+    // This does a backwards search from the target (usually Lara) towards the source (the AI entity).
+    // The m_expansions queue is initialized with the target box.
 
-    const auto currentBox = m_expansions.front();
+    const auto current = m_expansions.front();
     m_expansions.pop_front();
-    const auto searchZone = currentBox.get()->*zoneRef;
+    const auto searchZone = current.get()->*zoneRef;
 
-    for(const auto& predecessorBox : currentBox->overlaps)
+    for(const auto& neighbor : current->overlaps)
     {
-      if(predecessorBox == currentBox)
+      if(neighbor == current)
         continue;
 
-      if(searchZone != predecessorBox.get()->*zoneRef)
+      if(searchZone != neighbor.get()->*zoneRef)
       {
-        setReachable(predecessorBox, false);
+        setReachable(neighbor, false);
         continue;
       }
 
-      if(const auto dy = currentBox->floor - predecessorBox->floor; dy < -m_step || dy > -m_drop)
+      if(const auto dy = current->floor - neighbor->floor; dy < -m_step || dy > -m_drop)
       {
-        setReachable(predecessorBox, false);
+        setReachable(neighbor, false);
         continue;
       }
 
-      // update predecessor reachability and distance
-      if(updateEdge(currentBox, predecessorBox))
+      // Update reachability and distance of the neighbor
+      if(updateEdge(current, neighbor))
         continue;
 
-      const auto reachable = canVisit(*predecessorBox);
+      const auto reachable = canVisit(*neighbor);
       if(reachable)
       {
-        // success! connect both boxes
-        BOOST_ASSERT_MSG(m_edges.find(predecessorBox) == m_edges.end(), "cycle in pathfinder graph detected");
-        m_edges.emplace(predecessorBox, currentBox);
-        m_distances[predecessorBox] = m_distances[currentBox] + 1;
+        // Success! Connect both boxes.
+        BOOST_ASSERT_MSG(!m_edges.contains(neighbor), "cycle in pathfinder graph detected");
+        m_edges.emplace(neighbor, current);
+        m_distances[neighbor] = m_distances[current] + 1;
       }
 
-      setReachable(predecessorBox, reachable);
+      setReachable(neighbor, reachable);
     }
   }
 }
 
-void PathFinder::setReachable(const gsl::not_null<const world::Box*>& box, bool reachable)
+void PathFinder::setReachable(const gsl_lite::not_null<const world::Box*>& box, const bool reachable)
 {
   m_reachable[box] |= reachable;
-  if(reachable && std::find(m_expansions.begin(), m_expansions.end(), box) == m_expansions.end())
+  if(reachable && std::ranges::find(m_expansions, box) == m_expansions.end())
     m_expansions.emplace_back(box);
 }
 
-void PathFinder::updateDistance(const gsl::not_null<const world::Box*>& currentBox,
-                                const gsl::not_null<const world::Box*>& predecessorBox)
+void PathFinder::updateDistance(const gsl_lite::not_null<const world::Box*>& current,
+                                const gsl_lite::not_null<const world::Box*>& neighbor)
 {
-  BOOST_ASSERT(m_distances.find(predecessorBox) != m_distances.end());
-  BOOST_ASSERT(m_distances.find(currentBox) != m_distances.end());
+  BOOST_ASSERT(m_distances.contains(neighbor));
+  BOOST_ASSERT(m_distances.contains(current));
 
-  auto& currentPredecessorDistance = m_distances[predecessorBox];
-  auto newPredecessorDistance = m_distances[currentBox] + 1;
-  if(currentPredecessorDistance <= newPredecessorDistance)
+  auto& neighborDistance = m_distances[neighbor];
+  const auto newDistance = m_distances[current] + 1;
+  if(neighborDistance <= newDistance)
     return;
 
-  currentPredecessorDistance = newPredecessorDistance;
-  m_edges.erase(currentBox);
-  m_edges.emplace(currentBox, predecessorBox);
-  m_expansions.emplace_back(predecessorBox);
+  neighborDistance = newDistance;
+  m_edges.erase(current);
+  m_edges.emplace(current, neighbor);
+  m_expansions.emplace_back(neighbor);
 }
 
-bool PathFinder::updateEdge(const gsl::not_null<const world::Box*>& currentBox,
-                            const gsl::not_null<const world::Box*>& predecessorBox)
+bool PathFinder::updateEdge(const gsl_lite::not_null<const world::Box*>& current,
+                            const gsl_lite::not_null<const world::Box*>& neighbor)
 {
-  if(!m_reachable.at(currentBox))
+  if(!m_reachable.at(current))
   {
-    // propagate "unreachable" to all connected boxes if their reachability hasn't been determined yet
-    setReachable(predecessorBox, false);
+    // Propagate "unreachable" to neighbors
+    setReachable(neighbor, false);
     return true;
   }
 
-  if(const auto it = m_reachable.find(predecessorBox); it != m_reachable.end() && it->second)
+  if(const auto it = m_reachable.find(neighbor); it != m_reachable.end() && it->second)
   {
-    // predecessor was already determined to be reachable, but path might be shorter
-    updateDistance(currentBox, predecessorBox);
+    // Neighbor was already reachable, but we might have found a shorter path.
+    updateDistance(current, neighbor);
     return true;
   }
 
@@ -517,7 +520,7 @@ void PathFinder::deserialize(const serialization::Deserializer<world::World>& se
 }
 
 void PathFinder::init(const world::World& world,
-                      const gsl::not_null<const world::Box*>& box,
+                      const gsl_lite::not_null<const world::Box*>& box,
                       const script::ObjectInfo& objectInfo)
 {
   m_cannotVisitBlockable = objectInfo.cannot_visit_blockable;
@@ -536,21 +539,23 @@ bool PathFinder::canVisit(const world::Box& box) const noexcept
   return canVisit(box, false, false);
 }
 
-bool PathFinder::canVisit(const world::Box& box, bool ignoreBlocked, bool ignoreBlockable) const noexcept
+bool PathFinder::canVisit(const world::Box& box, const bool ignoreBlocked, const bool ignoreBlockable) const noexcept
 {
   if(m_cannotVisitBlocked && box.blocked)
     return ignoreBlocked;
+
   if(m_cannotVisitBlockable && box.blockable)
     return ignoreBlockable;
+
   return true;
 }
 
-void PathFinder::setRandomSearchTarget(const gsl::not_null<const world::Box*>& box)
+void PathFinder::setRandomSearchTarget(const gsl_lite::not_null<const world::Box*>& box)
 {
-  const auto xSize = box->xInterval.size() - 2 * MovementCalculator::Margin;
-  m_target.X = util::rand15(xSize) + box->xInterval.min + MovementCalculator::Margin;
-  const auto zSize = box->zInterval.size() - 2 * MovementCalculator::Margin;
-  m_target.Z = util::rand15(zSize) + box->zInterval.min + MovementCalculator::Margin;
+  const auto xSize = box->xInterval.size() - 2 * SteeringCalculator::Margin;
+  m_target.X = util::rand15(xSize) + box->xInterval.min + SteeringCalculator::Margin;
+  const auto zSize = box->zInterval.size() - 2 * SteeringCalculator::Margin;
+  m_target.Z = util::rand15(zSize) + box->zInterval.min + SteeringCalculator::Margin;
   if(isFlying())
   {
     m_target.Y = box->floor - 384_len;
@@ -561,7 +566,7 @@ void PathFinder::setRandomSearchTarget(const gsl::not_null<const world::Box*>& b
   }
 }
 
-void PathFinder::setTargetBox(const gsl::not_null<const world::Box*>& box)
+void PathFinder::setTargetBox(const gsl_lite::not_null<const world::Box*>& box)
 {
   if(box == m_targetBox)
     return;
@@ -578,13 +583,13 @@ void PathFinder::setTargetBox(const gsl::not_null<const world::Box*>& box)
   m_edges.clear();
 }
 
-const gsl::not_null<const world::Box*>& PathFinder::getRandomBox() const
+const gsl_lite::not_null<const world::Box*>& PathFinder::getRandomBox() const
 {
   gsl_Expects(!m_boxes.empty());
   return m_boxes[util::rand15(m_boxes.size())];
 }
 
-void PathFinder::resetBoxes(const world::World& world, const gsl::not_null<const world::Box*>& box)
+void PathFinder::resetBoxes(const world::World& world, const gsl_lite::not_null<const world::Box*>& box)
 {
   const auto zoneRef1 = world::Box::getZoneRef(false, isFlying(), m_step);
   const auto zoneRef2 = world::Box::getZoneRef(true, isFlying(), m_step);
@@ -615,13 +620,13 @@ void PathFinder::setLimits(const world::World& world,
   // NOLINTNEXTLINE(hicpp-signed-bitwise, bitwise-instead-of-logical)
   if((std::exchange(m_step, step) != step) | (std::exchange(m_drop, drop) != drop) | (std::exchange(m_fly, fly) != fly))
   {
-    resetBoxes(world, gsl::not_null{box});
+    resetBoxes(world, gsl_lite::not_null{box});
   }
   if(m_targetBox != box)
   {
-    setTargetBox(gsl::not_null{box});
-    BOOST_ASSERT(std::count(m_boxes.begin(), m_boxes.end(), box) != 0);
-    setRandomSearchTarget(gsl::not_null{box});
+    setTargetBox(gsl_lite::not_null{box});
+    BOOST_ASSERT(std::ranges::count(m_boxes, box) != 0);
+    setRandomSearchTarget(gsl_lite::not_null{box});
   }
 }
-} // namespace engine::ai
+} // namespace engine::ai
\ No newline at end of file
diff --git a/src/engine/ai/pathfinder.h b/src/engine/ai/pathfinder.h
index 09cb4e1ac..dac1e0a42 100644
--- a/src/engine/ai/pathfinder.h
+++ b/src/engine/ai/pathfinder.h
@@ -8,7 +8,7 @@
 
 #include <cstddef>
 #include <deque>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <unordered_map>
 #include <vector>
 
@@ -32,36 +32,37 @@ struct PathFinder
   [[nodiscard]] bool canVisit(const world::Box& box, bool ignoreBlocked, bool ignoreBlockable) const noexcept;
 
   /**
-   * Sets #m_target to a random position within @p box with a margin of #Margin.
-   */
-  void setRandomSearchTarget(const gsl::not_null<const world::Box*>& box);
+* Sets #m_target to a random position within @p box with a margin of #Margin.
+*/
+  void setRandomSearchTarget(const gsl_lite::not_null<const world::Box*>& box);
 
   /**
-   * Calculates the next directly movable position from @p startPos and @p startBox, i.e. a position that's reachable
-   * when moving straight towards it without collisions. @p startBox must contain @p startPos. @p moveTarget is an
-   * output-only parameter and doesn't need to be initialised properly.
-   *
-   * @return @c true if a valid movement target was found, @c false otherwise.
-   */
+* Calculates the next directly movable position from @p startPos and @p startBox, i.e. a position that's reachable
+* when moving straight towards it without collisions. @p startBox must contain @p startPos. @p moveTarget is an
+* output-only parameter and doesn't need to be initialised properly.
+*
+* @return @c true if a valid movement target was found, @c false otherwise.
+*/
   bool calculateTarget(const world::World& world,
                        core::TRVec& moveTarget,
                        const core::TRVec& startPos,
-                       const gsl::not_null<const world::Box*>& startBox);
+                       const gsl_lite::not_null<const world::Box*>& startBox);
 
   /**
-   * Resets the search state and starts a new search for a path to @p box.
-   */
-  void setTargetBox(const gsl::not_null<const world::Box*>& box);
+* Resets the search state and starts a new search for a path to @p box.
+*/
+  void setTargetBox(const gsl_lite::not_null<const world::Box*>& box);
 
   void serialize(const serialization::Serializer<world::World>& ser) const;
   void deserialize(const serialization::Deserializer<world::World>& ser);
 
-  void
-    init(const world::World& world, const gsl::not_null<const world::Box*>& box, const script::ObjectInfo& objectInfo);
+  void init(const world::World& world,
+            const gsl_lite::not_null<const world::Box*>& box,
+            const script::ObjectInfo& objectInfo);
 
   void setLimits(const world::World& world, const core::Length& step, const core::Length& drop, const core::Length& fly)
   {
-    setLimits(world, gsl::not_null{m_targetBox}, step, drop, fly);
+    setLimits(world, gsl_lite::not_null{m_targetBox}, step, drop, fly);
   }
 
   void setLimits(const world::World& world,
@@ -72,17 +73,17 @@ struct PathFinder
 
   //
   /**
-   * Returns @c true if and only if the @p box is visited and marked unreachable.
-   */
-  [[nodiscard]] bool isUnreachable(const gsl::not_null<const world::Box*>& box) const
+* Returns @c true if and only if the @p box is visited and marked unreachable.
+*/
+  [[nodiscard]] bool isUnreachable(const gsl_lite::not_null<const world::Box*>& box) const
   {
     const auto it = m_reachable.find(box);
     return it != m_reachable.end() && !it->second;
   }
 
-  [[nodiscard]] const gsl::not_null<const world::Box*>& getRandomBox() const;
+  [[nodiscard]] const gsl_lite::not_null<const world::Box*>& getRandomBox() const;
 
-  [[nodiscard]] const world::Box* getNextPathBox(const gsl::not_null<const world::Box*>& box) const
+  [[nodiscard]] const world::Box* getNextPathBox(const gsl_lite::not_null<const world::Box*>& box) const
   {
     const auto it = m_edges.find(box);
     return it == m_edges.end() ? nullptr : it->second.get();
@@ -119,24 +120,24 @@ struct PathFinder
   }
 
 private:
-  void resetBoxes(const world::World& world, const gsl::not_null<const world::Box*>& box);
+  void resetBoxes(const world::World& world, const gsl_lite::not_null<const world::Box*>& box);
 
   /**
    * Does a limited expansion of the path graph and propagates reachability information.
    */
-  void expandNodes(const world::World& world);
-
-  void setReachable(const gsl::not_null<const world::Box*>& box, bool reachable);
-  void updateDistance(const gsl::not_null<const world::Box*>& currentBox,
-                      const gsl::not_null<const world::Box*>& predecessorBox);
-  bool updateEdge(const gsl::not_null<const world::Box*>& currentBox,
-                  const gsl::not_null<const world::Box*>& predecessorBox);
-
-  std::vector<gsl::not_null<const world::Box*>> m_boxes;
-  std::deque<gsl::not_null<const world::Box*>> m_expansions;
-  std::unordered_map<gsl::not_null<const world::Box*>, bool> m_reachable;
-  std::unordered_map<gsl::not_null<const world::Box*>, size_t> m_distances;
-  std::unordered_map<gsl::not_null<const world::Box*>, gsl::not_null<const world::Box*>> m_edges;
+  void expandPathGraph(const world::World& world);
+
+  void setReachable(const gsl_lite::not_null<const world::Box*>& box, bool reachable);
+  void updateDistance(const gsl_lite::not_null<const world::Box*>& current,
+                      const gsl_lite::not_null<const world::Box*>& neighbor);
+  bool updateEdge(const gsl_lite::not_null<const world::Box*>& current,
+                  const gsl_lite::not_null<const world::Box*>& neighbor);
+
+  std::vector<gsl_lite::not_null<const world::Box*>> m_boxes;
+  std::deque<gsl_lite::not_null<const world::Box*>> m_expansions;
+  std::unordered_map<gsl_lite::not_null<const world::Box*>, bool> m_reachable;
+  std::unordered_map<gsl_lite::not_null<const world::Box*>, size_t> m_distances;
+  std::unordered_map<gsl_lite::not_null<const world::Box*>, gsl_lite::not_null<const world::Box*>> m_edges;
   //! @brief The target box we need to reach
   const world::Box* m_targetBox = nullptr;
   core::TRVec m_target;
@@ -155,4 +156,4 @@ struct PathFinder
   core::Length m_fly = 0_len;
   //! @}
 };
-} // namespace engine::ai
+} // namespace engine::ai
\ No newline at end of file
diff --git a/src/engine/ai/py_module.h b/src/engine/ai/py_module.h
index 6a283070c..ff7d13887 100644
--- a/src/engine/ai/py_module.h
+++ b/src/engine/ai/py_module.h
@@ -18,10 +18,10 @@ inline void initAiModule(const pybind11::module& m)
     .def_readwrite("mood", &CreatureInfo::mood)
     .def_readwrite("target", &CreatureInfo::target);
 
-  py::enum_<engine::ai::Mood>(m, "Mood")
-    .value("BORED", engine::ai::Mood::Bored)
-    .value("ATTACK", engine::ai::Mood::Attack)
-    .value("ESCAPE", engine::ai::Mood::Escape)
-    .value("STALK", engine::ai::Mood::Stalk);
+  py::enum_<Mood>(m, "Mood")
+    .value("BORED", Mood::Bored)
+    .value("ATTACK", Mood::Attack)
+    .value("ESCAPE", Mood::Escape)
+    .value("STALK", Mood::Stalk);
 }
 } // namespace engine::ai
diff --git a/src/engine/audioengine.cpp b/src/engine/audioengine.cpp
index 629279347..6f562d3ec 100644
--- a/src/engine/audioengine.cpp
+++ b/src/engine/audioengine.cpp
@@ -31,7 +31,7 @@
 #include <cstdint>
 #include <filesystem>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <utility>
 #include <vector>
@@ -164,15 +164,15 @@ void AudioEngine::triggerNormalCdTrack(const script::Gameflow& gameflow,
   }
 }
 
-void AudioEngine::playStopCdTrack(const script::Gameflow& gameflow, const TR1TrackId trackId, bool stop)
+void AudioEngine::playStopCdTrack(const script::Gameflow& gameflow, const TR1TrackId trackId, const bool stop)
 {
-  if(gameflow.getTracks().count(trackId) == 0)
+  if(!gameflow.getTracks().contains(trackId))
   {
     BOOST_LOG_TRIVIAL(warning) << "Track " << toString(trackId) << " is not defined in the gameflow";
     return;
   }
 
-  const gsl::not_null trackInfo{gameflow.getTracks().at(trackId)};
+  const gsl_lite::not_null trackInfo{gameflow.getTracks().at(trackId)};
 
   m_currentTrack.reset();
 
@@ -182,8 +182,8 @@ void AudioEngine::playStopCdTrack(const script::Gameflow& gameflow, const TR1Tra
     m_soundEngine->getDevice().registerUpdateCallback(audio::FadeVolumeCallback{
       0.0f,
       FadeOutDuration,
-      gsl::not_null{currentlyPlaying},
-      audio::FadeVolumeCallback::FinalCallback{[currentlyPlaying, slot = trackInfo->slot, this]()
+      gsl_lite::not_null{currentlyPlaying},
+      audio::FadeVolumeCallback::FinalCallback{[currentlyPlaying, slot = trackInfo->slot, this]
                                                {
                                                  BOOST_LOG_TRIVIAL(debug) << "playStopCdTrack - fade out slot " << slot
                                                                           << " done, removing stream";
@@ -230,7 +230,7 @@ std::shared_ptr<audio::Voice> AudioEngine::playSoundEffect(const core::SoundEffe
     return nullptr;
   }
 
-  const auto soundEffect = gsl::not_null{soundEffectIt->second};
+  const auto soundEffect = gsl_lite::not_null{soundEffectIt->second};
   if(soundEffect->chance != 0 && util::rand15() > soundEffect->chance)
     return nullptr;
 
@@ -259,14 +259,14 @@ std::shared_ptr<audio::Voice> AudioEngine::playSoundEffect(const core::SoundEffe
     }
     else
     {
-      auto voice = m_soundEngine->playBuffer(buffer, sample, pitch, volume, emitter);
+      const auto voice = m_soundEngine->playBuffer(buffer, sample, pitch, volume, emitter);
       m_sfx.add(voice);
       voice->setLooping(true);
       voice->play();
       return voice.get();
     }
   case loader::file::PlaybackType::Restart:
-    if(auto voices = m_soundEngine->getVoicesForBuffer(emitter, sample); !voices.empty())
+    if(const auto voices = m_soundEngine->getVoicesForBuffer(emitter, sample); !voices.empty())
     {
       gsl_Assert(voices.size() == 1);
       auto voice = voices[0];
@@ -282,7 +282,7 @@ std::shared_ptr<audio::Voice> AudioEngine::playSoundEffect(const core::SoundEffe
     }
     else
     {
-      auto voice = m_soundEngine->playBuffer(buffer, sample, pitch, volume, emitter);
+      const auto voice = m_soundEngine->playBuffer(buffer, sample, pitch, volume, emitter);
       m_sfx.add(voice);
       return voice.get();
     }
@@ -294,13 +294,13 @@ std::shared_ptr<audio::Voice> AudioEngine::playSoundEffect(const core::SoundEffe
     }
     else
     {
-      auto voice = m_soundEngine->playBuffer(buffer, sample, pitch, volume, emitter);
+      const auto voice = m_soundEngine->playBuffer(buffer, sample, pitch, volume, emitter);
       m_sfx.add(voice);
       return voice.get();
     }
   default:
   {
-    auto handle = m_soundEngine->playBuffer(buffer, sample, pitch, volume, emitter);
+    const auto handle = m_soundEngine->playBuffer(buffer, sample, pitch, volume, emitter);
     m_sfx.add(handle);
     return handle.get();
   }
@@ -313,7 +313,7 @@ void AudioEngine::stopSoundEffect(const core::SoundEffectId& id, const audio::Em
   if(soundEffectIt == m_soundEffects.end())
     return;
 
-  const auto soundEffect = gsl::not_null{soundEffectIt->second};
+  const auto soundEffect = gsl_lite::not_null{soundEffectIt->second};
   const size_t first = soundEffect->sample.get();
   const size_t last = first + soundEffect->getSampleCount();
 
@@ -330,7 +330,7 @@ void AudioEngine::stopSoundEffect(const core::SoundEffectId& id, const audio::Em
     BOOST_LOG_TRIVIAL(debug) << "Stopped samples of sound effect " << toString(id.get_as<TR1SoundEffect>());
 }
 
-void AudioEngine::setUnderwater(bool underwater)
+void AudioEngine::setUnderwater(const bool underwater)
 {
   if(underwater)
   {
@@ -350,7 +350,7 @@ void AudioEngine::setUnderwater(bool underwater)
   }
 }
 
-void AudioEngine::addWav(const gsl::not_null<const uint8_t*>& buffer)
+void AudioEngine::addWav(const gsl_lite::not_null<const uint8_t*>& buffer)
 {
   auto handle = std::make_shared<audio::BufferHandle>();
   handle->fillFromWav(buffer.get());
@@ -379,7 +379,7 @@ void AudioEngine::deserialize(const serialization::Deserializer<world::World>& s
   m_soundEngine->deserializeStreams(ser, m_rootPath, m_music);
 }
 
-AudioEngine::AudioEngine(gsl::not_null<world::World*> world,
+AudioEngine::AudioEngine(gsl_lite::not_null<world::World*> world,
                          std::filesystem::path rootPath,
                          std::shared_ptr<audio::SoundEngine> soundEngine)
     : m_world{std::move(world)}
@@ -398,11 +398,11 @@ void AudioEngine::initForWorld(const std::vector<loader::file::SoundEffectProper
     if(soundEffects[i] < 0)
       continue;
 
-    m_soundEffects[gsl::narrow<int>(i)] = &m_soundEffectProperties.at(soundEffects[i]);
+    m_soundEffects[gsl_lite::narrow<int>(i)] = &m_soundEffectProperties.at(soundEffects[i]);
   }
   m_cdTrackActivationStates.clear();
   m_cdTrack50time = 0_frame;
   m_underwaterAmbience.reset();
   m_currentTrack.reset();
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/audioengine.h b/src/engine/audioengine.h
index de3446551..481e835cc 100644
--- a/src/engine/audioengine.h
+++ b/src/engine/audioengine.h
@@ -13,7 +13,7 @@
 #include <cstdint>
 #include <filesystem>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 #include <memory>
@@ -46,13 +46,13 @@ enum class TR1TrackId;
 
 class AudioEngine
 {
-  gsl::not_null<world::World*> m_world;
+  gsl_lite::not_null<world::World*> m_world;
   std::filesystem::path m_rootPath;
   gslu::nn_shared<audio::SoundEngine> m_soundEngine;
 
   std::vector<loader::file::SoundEffectProperties> m_soundEffectProperties;
   boost::container::flat_map<int, const loader::file::SoundEffectProperties*> m_soundEffects;
-  std::map<TR1TrackId, engine::floordata::ActivationState> m_cdTrackActivationStates;
+  std::map<TR1TrackId, floordata::ActivationState> m_cdTrackActivationStates;
   core::Frame m_cdTrack50time = 0_frame;
   std::shared_ptr<audio::Voice> m_underwaterAmbience;
   std::optional<TR1TrackId> m_currentTrack;
@@ -61,7 +61,7 @@ class AudioEngine
   audio::VoiceGroup m_sfx{0.8f};
 
 public:
-  explicit AudioEngine(gsl::not_null<world::World*> world,
+  explicit AudioEngine(gsl_lite::not_null<world::World*> world,
                        std::filesystem::path rootPath,
                        std::shared_ptr<audio::SoundEngine> soundEngine);
 
@@ -91,14 +91,14 @@ class AudioEngine
 
   void setUnderwater(bool underwater);
 
-  void addWav(const gsl::not_null<const uint8_t*>& buffer);
+  void addWav(const gsl_lite::not_null<const uint8_t*>& buffer);
 
-  void setMusicGain(float gain)
+  void setMusicGain(const float gain)
   {
     m_music.setGain(gain);
   }
 
-  void setSfxGain(float gain)
+  void setSfxGain(const float gain)
   {
     m_sfx.setGain(gain);
   }
@@ -127,4 +127,4 @@ class AudioEngine
   void serialize(const serialization::Serializer<world::World>& ser) const;
   void deserialize(const serialization::Deserializer<world::World>& ser);
 };
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/cameracontroller.cpp b/src/engine/cameracontroller.cpp
index d16e44576..39dac1c25 100644
--- a/src/engine/cameracontroller.cpp
+++ b/src/engine/cameracontroller.cpp
@@ -1,6 +1,7 @@
 #include "cameracontroller.h"
 
 #include "audio/listener.h"
+#include "audio/soundengine.h"
 #include "core/angle.h"
 #include "core/boundingbox.h"
 #include "core/genericvec.h"
@@ -8,6 +9,7 @@
 #include "core/magic.h"
 #include "core/units.h"
 #include "core/vec.h"
+#include "engine.h"
 #include "engine/floordata/floordata.h"
 #include "engine/floordata/types.h"
 #include "engine/heightinfo.h"
@@ -42,7 +44,7 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <unordered_set>
 #include <utility>
@@ -52,30 +54,31 @@ namespace engine
 {
 namespace
 {
-void freeLookClamp(core::Length& goalX,
-                   core::Length& goalY,
-                   const core::Length& startX,
-                   const core::Length& startY,
-                   const core::Length& minX,
-                   const core::Length& minY,
-                   const core::Length& maxX,
-                   const core::Length& maxY) noexcept
+void freeLookClamp(core::Length& targetA,
+                   core::Length& targetB,
+                   const core::Length& pivotA,
+                   const core::Length& pivotB,
+                   const core::Length& minA,
+                   const core::Length& minB,
+                   const core::Length& maxA,
+                   const core::Length& maxB) noexcept
 {
-  const auto dx = goalX - startX;
-  const auto dy = goalY - startY;
-  if((minX < maxX) != (startX < minX))
+  const auto da = targetA - pivotA;
+  const auto db = targetB - pivotB;
+  // ReSharper disable once CppRedundantParentheses
+  if((minA < maxA) != (pivotA < minA))
   {
-    goalY = startY + dy * (minX - startX) / dx;
-    goalX = minX;
+    targetB = pivotB + db * (minA - pivotA) / da;
+    targetA = minA;
   }
-  if((goalY < minY && minY < std::min(maxY, startY)) || (goalY > minY && minY > std::max(maxY, startY)))
+  if((targetB < minB && minB < std::min(maxB, pivotB)) || (targetB > minB && minB > std::max(maxB, pivotB)))
   {
-    goalX = startX + dx * (minY - startY) / dy;
-    goalY = minY;
+    targetA = pivotA + da * (minB - pivotB) / db;
+    targetB = minB;
   }
 }
 
-bool isVerticallyOutsideRoom(Location location, const ObjectManager& objectManager)
+bool isCollidingWithFloorOrCeiling(Location location, const ObjectManager& objectManager)
 {
   const auto sector = location.updateRoom();
   const auto floor = HeightInfo::fromFloor(sector, location.position, objectManager.getObjects()).y;
@@ -84,81 +87,80 @@ bool isVerticallyOutsideRoom(Location location, const ObjectManager& objectManag
 }
 
 void clampToCorners(const core::Area& targetHorizontalDistanceSq,
-                    core::Length& x,
-                    core::Length& y,
-                    const core::Length& targetX,
-                    const core::Length& targetY,
-                    const core::Length& minX,
-                    const core::Length& minY,
-                    const core::Length& maxX,
-                    const core::Length& maxY)
+                    core::Length& posA,
+                    core::Length& posB,
+                    const core::Length& pivotA,
+                    const core::Length& pivotB,
+                    const core::Length& minA,
+                    const core::Length& minB,
+                    const core::Length& maxA,
+                    const core::Length& maxB)
 {
-  const auto dxSqMinX = util::square(targetX - minX);
-  const auto dySqMinY = util::square(targetY - minY);
+  const auto daSqMinA = util::square(pivotA - minA);
+  const auto dbSqMinB = util::square(pivotB - minB);
 
-  if(const auto dxySqMin = dxSqMinX + dySqMinY; dxySqMin > targetHorizontalDistanceSq)
+  if(const auto dabSqMin = daSqMinA + dbSqMinB; dabSqMin > targetHorizontalDistanceSq)
   {
-    x = minX;
-    if(const auto delta = targetHorizontalDistanceSq - dxSqMinX; delta >= util::square(0_len))
+    posA = minA;
+    if(const auto delta = targetHorizontalDistanceSq - daSqMinA; delta >= util::square(0_len))
     {
       auto tmp = sqrt(delta);
-      if(minY < maxY)
+      if(minB < maxB)
         tmp = -tmp;
-      y = tmp + targetY;
+      posB = tmp + pivotB;
     }
     return;
   }
-  else if(dxySqMin > util::square(core::QuarterSectorSize))
+  else if(dabSqMin > util::square(core::QuarterSectorSize))
   {
-    x = minX;
-    y = minY;
+    posA = minA;
+    posB = minB;
     return;
   }
 
-  if(const auto dxySqMinXMaxY = dxSqMinX + util::square(targetY - maxY); dxySqMinXMaxY > targetHorizontalDistanceSq)
+  if(const auto dabSqMinAMaxB = daSqMinA + util::square(pivotB - maxB); dabSqMinAMaxB > targetHorizontalDistanceSq)
   {
-    x = minX;
-    if(const auto delta = targetHorizontalDistanceSq - dxSqMinX; delta >= util::square(0_len))
+    posA = minA;
+    if(const auto delta = targetHorizontalDistanceSq - daSqMinA; delta >= util::square(0_len))
     {
       auto tmp = sqrt(delta);
-      if(minY >= maxY)
+      if(minB >= maxB)
         tmp = -tmp;
-      y = tmp + targetY;
+      posB = tmp + pivotB;
     }
     return;
   }
-  else if(dxySqMinXMaxY > util::square(core::QuarterSectorSize))
+  else if(dabSqMinAMaxB > util::square(core::QuarterSectorSize))
   {
-    x = minX;
-    y = maxY;
+    posA = minA;
+    posB = maxB;
     return;
   }
 
-  const auto dxySqMaxXMinY = util::square(targetX - maxX) + dySqMinY;
-  if(targetHorizontalDistanceSq >= dxySqMaxXMinY)
+  if(const auto dabSqMaxAMinB = util::square(pivotA - maxA) + dbSqMinB; targetHorizontalDistanceSq >= dabSqMaxAMinB)
   {
-    x = maxX;
-    y = minY;
+    posA = maxA;
+    posB = minB;
     return;
   }
-  if(const auto delta = targetHorizontalDistanceSq - dySqMinY; delta >= util::square(0_len))
+  if(const auto delta = targetHorizontalDistanceSq - dbSqMinB; delta >= util::square(0_len))
   {
-    y = minY;
+    posB = minB;
     auto tmp = sqrt(delta);
-    if(minX >= maxX)
+    if(minA >= maxA)
       tmp = -tmp;
-    x = tmp + targetX;
+    posA = tmp + pivotA;
   }
 }
 
-using ClampCallback = void(core::Length& goalX,
-                           core::Length& goalY,
-                           const core::Length& startX,
-                           const core::Length& startY,
-                           const core::Length& minX,
-                           const core::Length& minY,
-                           const core::Length& maxX,
-                           const core::Length& maxY);
+using ClampCallback = void(core::Length& posA,
+                           core::Length& posB,
+                           const core::Length& pivotA,
+                           const core::Length& pivotB,
+                           const core::Length& minA,
+                           const core::Length& minB,
+                           const core::Length& maxA,
+                           const core::Length& maxB);
 
 Location clampBox(const Location& start,
                   const core::TRVec& goal,
@@ -166,9 +168,9 @@ Location clampBox(const Location& start,
                   const ObjectManager& objectManager)
 {
   auto result = raycastLineOfSight(start, goal, objectManager).second;
-  const auto startSector = gsl::not_null{start.room->getSectorByAbsolutePosition(start.position)};
+  const auto startSector = gsl_lite::not_null{start.room->getSectorByAbsolutePosition(start.position)};
   auto box = startSector->box;
-  if(const auto goalSector = gsl::not_null{result.room->getSectorByAbsolutePosition(result.position)};
+  if(const auto goalSector = gsl_lite::not_null{result.room->getSectorByAbsolutePosition(result.position)};
      const auto goalBox = goalSector->box)
   {
     if(box == nullptr || !box->xInterval.contains(result.position.X) || !box->zInterval.contains(result.position.Z))
@@ -194,7 +196,7 @@ Location clampBox(const Location& start,
 
   const auto testPosInvalid = [&testPos, &result, &objectManager]
   {
-    return isVerticallyOutsideRoom(Location{result.room, testPos}, objectManager);
+    return isCollidingWithFloorOrCeiling(Location{result.room, testPos}, objectManager);
   };
 
   alignNeg(testPos.Z);
@@ -284,13 +286,15 @@ Location clampBox(const Location& start,
 }
 } // namespace
 
-CameraController::CameraController(const gsl::not_null<world::World*>& world,
+CameraController::CameraController(const gsl_lite::not_null<world::World*>& world,
                                    gslu::nn_shared<render::scene::Camera> camera)
-    : Listener{gsl::not_null{world->getPresenter().getSoundEngine().get()}}
+    : Listener{gsl_lite::not_null{world->getEngine().getPresenter().getSoundEngine().get().get()}}
     , m_camera{std::move(camera)}
     , m_world{world}
     , m_location{world->getObjectManager().getLara().m_state.location}
+    , m_previousLocation{world->getObjectManager().getLara().m_state.location}
     , m_lookAt{world->getObjectManager().getLara().m_state.location}
+    , m_previousLookAt{world->getObjectManager().getLara().m_state.location}
 {
   const auto yOffset = world->getObjectManager().getLara().m_state.location.position.Y - 1_sectors;
   m_lookAt.position.Y -= yOffset;
@@ -337,14 +341,14 @@ void CameraController::setCamOverride(const floordata::CameraParameters& camPara
     return;
 
   if(camParams.timeout != 1_sec)
-    m_camOverrideTimeout = camParams.timeout * core::FrameRate;
+    m_overrideTimeout = camParams.timeout * core::FrameRate;
   else
-    m_camOverrideTimeout = 1_frame;
+    m_overrideTimeout = 1_frame;
 
   if(camParams.oneshot)
     m_world->getCameraSinks()[camId].setActive(true);
 
-  m_smoothness = 1_frame + gsl::narrow_cast<core::Frame::type>(camParams.smoothness) * 4_frame;
+  m_smoothingFactor = 1_frame + gsl_lite::narrow_cast<core::Frame::type>(camParams.smoothness) * 4_frame;
   if(fromHeavy)
     m_mode = CameraMode::HeavyFixedPosition;
   else
@@ -363,7 +367,7 @@ void CameraController::handleCommandSequence(const floordata::FloorDataValue* cm
     NoChange
   };
 
-  Type type = Type::NoChange;
+  auto type = Type::NoChange;
   while(true)
   {
     const floordata::Command command{*cmdSequence++};
@@ -384,7 +388,7 @@ void CameraController::handleCommandSequence(const floordata::FloorDataValue* cm
       else
       {
         m_fixedCameraId = m_currentFixedCameraId;
-        if(m_camOverrideTimeout >= 0_frame && m_mode != CameraMode::FreeLook && m_mode != CameraMode::Combat)
+        if(m_overrideTimeout >= 0_frame && m_mode != CameraMode::FreeLook && m_mode != CameraMode::Combat)
         {
           type = Type::FixedCamChange;
           m_mode = CameraMode::FixedPosition;
@@ -392,7 +396,7 @@ void CameraController::handleCommandSequence(const floordata::FloorDataValue* cm
         else
         {
           type = Type::Invalid;
-          m_camOverrideTimeout = -1_frame;
+          m_overrideTimeout = -1_frame;
         }
       }
     }
@@ -411,7 +415,7 @@ void CameraController::handleCommandSequence(const floordata::FloorDataValue* cm
     m_lookAtObject = nullptr;
 }
 
-std::unordered_set<const world::Portal*> CameraController::tracePortals()
+std::unordered_set<const world::Portal*> CameraController::traceWaterSurfacePortals() const
 {
   for(const auto& room : m_world->getRooms())
   {
@@ -422,37 +426,36 @@ std::unordered_set<const world::Portal*> CameraController::tracePortals()
   return render::PortalTracer::trace(*m_location.room, *m_world);
 }
 
-std::unordered_set<const world::Portal*> CameraController::update()
+void CameraController::updateGameLogic(const bool inGameCamera)
 {
+  m_previousLocation = m_location;
+  m_previousLookAt = m_lookAt;
+
   m_rotationAroundLara.X = std::clamp(m_rotationAroundLara.X, -85_deg, +85_deg);
 
   if(m_mode == CameraMode::Cinematic)
   {
-    m_cinematicFrame
-      = std::min(m_cinematicFrame + 1_frame,
-                 core::Frame{gsl::narrow_cast<core::Frame::type>(m_world->getCinematicFrames().size() - 1)});
-
-    updateCinematic(m_world->getCinematicFrames()[gsl::narrow_cast<size_t>(m_cinematicFrame.get())], true);
-    return tracePortals();
+    tickCinematic(m_world->getCinematicFrames(), inGameCamera);
+    return;
   }
 
   if(m_modifier != CameraModifier::AllowSteepSlants)
     HeightInfo::skipSteepSlants = true;
 
-  const bool isCompletelyFixed
+  const bool isInFixedMode
     = m_lookAtObject != nullptr && (m_mode == CameraMode::FixedPosition || m_mode == CameraMode::HeavyFixedPosition);
 
   // if we have a fixed position, we also have an object we're looking at
   const auto focusedObject
-    = gsl::not_null{isCompletelyFixed ? m_lookAtObject.get() : &m_world->getObjectManager().getLara()};
+    = gsl_lite::not_null{isInFixedMode ? m_lookAtObject.get() : &m_world->getObjectManager().getLara()};
   auto focusBBox = focusedObject->getBoundingBox();
-  auto focusY = focusedObject->m_state.location.position.Y;
-  if(isCompletelyFixed)
-    focusY += focusBBox.y.mid();
+  auto lookAtHeight = focusedObject->m_state.location.position.Y;
+  if(isInFixedMode)
+    lookAtHeight += focusBBox.y.mid();
   else
-    focusY += focusBBox.y.max - focusBBox.y.size() * 3 / 4;
+    lookAtHeight += focusBBox.y.max - focusBBox.y.size() * 3 / 4;
 
-  if(m_lookAtObject != nullptr && !isCompletelyFixed)
+  if(m_lookAtObject != nullptr && !isInFixedMode)
   {
     // lara moves around and looks at some object, some sort of involuntary free look;
     // in this case, we have an object to look at, but the camera is _not_ fixed
@@ -466,7 +469,7 @@ std::unordered_set<const world::Portal*> CameraController::update()
     eyeRotY /= 2;
     focusBBox = m_lookAtObject->getBoundingBox();
     auto eyeRotX
-      = angleFromAtan(focusY - (focusBBox.y.mid() + m_lookAtObject->m_state.location.position.Y), distToFocused);
+      = angleFromAtan(lookAtHeight - (focusBBox.y.mid() + m_lookAtObject->m_state.location.position.Y), distToFocused);
     eyeRotX /= 2;
 
     if(abs(eyeRotY) < 50_deg && abs(eyeRotX) < 85_deg)
@@ -488,21 +491,21 @@ std::unordered_set<const world::Portal*> CameraController::update()
   m_lookAt.room = focusedObject->m_state.location.room;
   if(m_mode == CameraMode::FreeLook || m_mode == CameraMode::Combat)
   {
-    focusY -= core::QuarterSectorSize;
-    if(m_isCompletelyFixed)
+    lookAtHeight -= core::QuarterSectorSize;
+    if(m_wasFixedMode)
     {
-      m_lookAt.position.Y = focusY;
-      m_smoothness = 1_frame;
+      m_lookAt.position.Y = lookAtHeight;
+      m_smoothingFactor = 1_frame;
     }
     else
     {
-      m_lookAt.position.Y += (focusY - m_lookAt.position.Y) / 4;
+      m_lookAt.position.Y += (lookAtHeight - m_lookAt.position.Y) / 4;
       if(m_mode == CameraMode::FreeLook)
-        m_smoothness = 4_frame;
+        m_smoothingFactor = 4_frame;
       else
-        m_smoothness = 8_frame;
+        m_smoothingFactor = 8_frame;
     }
-    m_isCompletelyFixed = false;
+    m_wasFixedMode = false;
     if(m_mode == CameraMode::FreeLook)
       handleFreeLook();
     else
@@ -519,22 +522,22 @@ std::unordered_set<const world::Portal*> CameraController::update()
       m_lookAt.position += util::pitch(midZ, focusedObject->m_state.rotation.Y);
     }
 
-    if(m_isCompletelyFixed == isCompletelyFixed)
+    if(m_wasFixedMode == isInFixedMode)
     {
-      m_lookAt.position.Y += (focusY - m_lookAt.position.Y) / 4;
-      m_isCompletelyFixed = false;
+      m_lookAt.position.Y += (lookAtHeight - m_lookAt.position.Y) / 4;
+      m_wasFixedMode = false;
     }
     else
     {
       // switching between fixed cameras, so we're not doing any smoothing
-      m_smoothness = 1_frame;
-      m_lookAt.position.Y = focusY;
-      m_isCompletelyFixed = true;
+      m_smoothingFactor = 1_frame;
+      m_lookAt.position.Y = lookAtHeight;
+      m_wasFixedMode = true;
     }
 
     m_lookAt.room = focusedObject->m_state.location.room;
-    const auto sector = m_lookAt.updateRoom();
-    if(HeightInfo::fromFloor(sector, m_lookAt.position, m_world->getObjectManager().getObjects()).y
+    if(const auto sector = m_lookAt.updateRoom();
+       HeightInfo::fromFloor(sector, m_lookAt.position, m_world->getObjectManager().getObjects()).y
        < m_lookAt.position.Y)
       HeightInfo::skipSteepSlants = false;
 
@@ -544,9 +547,9 @@ std::unordered_set<const world::Portal*> CameraController::update()
       handleFixedCamera();
   }
 
-  m_isCompletelyFixed = isCompletelyFixed;
+  m_wasFixedMode = isInFixedMode;
   m_currentFixedCameraId = m_fixedCameraId;
-  if(m_mode != CameraMode::HeavyFixedPosition || m_camOverrideTimeout < 0_frame)
+  if(m_mode != CameraMode::HeavyFixedPosition || m_overrideTimeout < 0_frame)
   {
     m_modifier = CameraModifier::None;
     m_mode = CameraMode::Chase;
@@ -556,8 +559,6 @@ std::unordered_set<const world::Portal*> CameraController::update()
     m_fixedCameraId = -1;
   }
   HeightInfo::skipSteepSlants = false;
-
-  return tracePortals();
 }
 
 void CameraController::handleFixedCamera()
@@ -568,21 +569,21 @@ void CameraController::handleFixedCamera()
   auto [success, goal] = raycastLineOfSight(m_lookAt, camera.position, m_world->getObjectManager());
   if(!success)
   {
-    moveIntoBox(goal, core::QuarterSectorSize);
+    clampToVerticalBounds(goal, core::QuarterSectorSize);
   }
 
-  m_isCompletelyFixed = true;
-  updatePosition(goal, m_smoothness);
+  m_wasFixedMode = true;
+  updatePosition(goal, m_smoothingFactor);
 
-  if(m_camOverrideTimeout != 0_frame)
+  if(m_overrideTimeout != 0_frame)
   {
-    m_camOverrideTimeout -= 1_frame;
-    if(m_camOverrideTimeout == 0_frame)
-      m_camOverrideTimeout = -1_frame;
+    m_overrideTimeout -= 1_frame;
+    if(m_overrideTimeout == 0_frame)
+      m_overrideTimeout = -1_frame;
   }
 }
 
-core::Length CameraController::moveIntoBox(Location& goal, const core::Length& margin) const
+core::Length CameraController::clampToVerticalBounds(Location& goal, const core::Length& margin) const
 {
   const auto sector = goal.updateRoom();
   if(sector->box == nullptr)
@@ -592,28 +593,28 @@ core::Length CameraController::moveIntoBox(Location& goal, const core::Length& m
   }
 
   {
-    const auto narrowed = sector->box->zInterval.narrowed(margin);
-    if(goal.position.Z < narrowed.min
-       && isVerticallyOutsideRoom(goal.moved(0_len, 0_len, -margin), m_world->getObjectManager()))
+    if(const auto narrowed = sector->box->zInterval.narrowed(margin);
+       goal.position.Z < narrowed.min
+       && isCollidingWithFloorOrCeiling(goal.moved(0_len, 0_len, -margin), m_world->getObjectManager()))
     {
       goal.position.Z = narrowed.min;
     }
     else if(goal.position.Z > narrowed.max
-            && isVerticallyOutsideRoom(goal.moved(0_len, 0_len, margin), m_world->getObjectManager()))
+            && isCollidingWithFloorOrCeiling(goal.moved(0_len, 0_len, margin), m_world->getObjectManager()))
     {
       goal.position.Z = narrowed.max;
     }
   }
 
   {
-    const auto narrowed = sector->box->xInterval.narrowed(margin);
-    if(goal.position.X < narrowed.min
-       && isVerticallyOutsideRoom(goal.moved(-margin, 0_len, 0_len), m_world->getObjectManager()))
+    if(const auto narrowed = sector->box->xInterval.narrowed(margin);
+       goal.position.X < narrowed.min
+       && isCollidingWithFloorOrCeiling(goal.moved(-margin, 0_len, 0_len), m_world->getObjectManager()))
     {
       goal.position.X = narrowed.min;
     }
     else if(goal.position.X > narrowed.max
-            && isVerticallyOutsideRoom(goal.moved(margin, 0_len, 0_len), m_world->getObjectManager()))
+            && isCollidingWithFloorOrCeiling(goal.moved(margin, 0_len, 0_len), m_world->getObjectManager()))
     {
       goal.position.X = narrowed.max;
     }
@@ -632,9 +633,9 @@ core::Length CameraController::moveIntoBox(Location& goal, const core::Length& m
     return 0_len;
 }
 
-void CameraController::updatePosition(const Location& goal, const core::Frame& smoothFactor)
+void CameraController::updatePosition(const Location& goal, const core::Frame& smoothingFactor)
 {
-  m_location.position += (goal.position - m_location.position) / smoothFactor * 1_frame;
+  m_location.position += (goal.position - m_location.position) / smoothingFactor * 1_frame;
   m_location.room = goal.room;
   HeightInfo::skipSteepSlants = false;
   auto sector = m_location.updateRoom();
@@ -655,18 +656,19 @@ void CameraController::updatePosition(const Location& goal, const core::Frame& s
     floor = ceiling = (floor + ceiling) / 2;
   }
 
-  if(m_bounce < 0_len)
+  if(m_shakeAmplitude < 0_len)
   {
-    const core::TRVec tmp{util::rand15s(m_bounce), util::rand15s(m_bounce), util::rand15s(m_bounce)};
+    const core::TRVec tmp{
+      util::rand15s(m_shakeAmplitude), util::rand15s(m_shakeAmplitude), util::rand15s(m_shakeAmplitude)};
     m_location.position += tmp;
     m_lookAt.position += tmp;
-    m_bounce += 5_len;
+    m_shakeAmplitude += 5_len;
   }
-  else if(m_bounce > 0_len)
+  else if(m_shakeAmplitude > 0_len)
   {
-    m_location.position.Y += m_bounce;
-    m_lookAt.position.Y += m_bounce;
-    m_bounce = 0_len;
+    m_location.position.Y += m_shakeAmplitude;
+    m_lookAt.position.Y += m_shakeAmplitude;
+    m_shakeAmplitude = 0_len;
   }
 
   if(m_location.position.Y > floor)
@@ -675,13 +677,6 @@ void CameraController::updatePosition(const Location& goal, const core::Frame& s
     m_location.position.Y = ceiling;
 
   m_location.updateRoom();
-
-  if(m_location.position.X != m_lookAt.position.X || m_location.position.Z != m_lookAt.position.Z)
-  {
-    // only apply lookAt if we won't get NaN values because of parallel up and look axes
-    const auto m = lookAt(m_location.position.toRenderSystem(), m_lookAt.position.toRenderSystem(), {0, 1, 0});
-    m_camera->setViewMatrix(m);
-  }
 }
 
 void CameraController::chaseObject(const objects::Object& object)
@@ -693,7 +688,7 @@ void CameraController::chaseObject(const objects::Object& object)
     m_rotationAroundLara.X = -85_deg;
 
   const auto dist = util::cos(m_distance, m_rotationAroundLara.X);
-  auto goal = clampBox(
+  const auto goal = clampBox(
     m_lookAt,
     m_lookAt.position
       - util::pitch(
@@ -711,7 +706,7 @@ void CameraController::chaseObject(const objects::Object& object)
     },
     m_world->getObjectManager());
 
-  updatePosition(goal, m_isCompletelyFixed ? m_smoothness : 12_frame);
+  updatePosition(goal, m_wasFixedMode ? m_smoothingFactor : 12_frame);
 }
 
 void CameraController::handleFreeLook()
@@ -727,12 +722,12 @@ void CameraController::handleFreeLook()
   m_distance = core::DefaultCameraLaraDistance;
   m_lookAt.position += util::pitch(util::sin(-1_sectors / 2, m_rotationAroundLara.X), lara.m_state.rotation.Y);
 
-  if(isVerticallyOutsideRoom(m_lookAt, m_world->getObjectManager()))
+  if(isCollidingWithFloorOrCeiling(m_lookAt, m_world->getObjectManager()))
   {
     m_lookAt.position.X = lara.m_state.location.position.X;
     m_lookAt.position.Z = lara.m_state.location.position.Z;
   }
-  m_lookAt.position.Y += moveIntoBox(m_lookAt, core::CameraWallDistance);
+  m_lookAt.position.Y += clampToVerticalBounds(m_lookAt, core::CameraWallDistance);
 
   const auto goal = clampBox(m_lookAt,
                              m_lookAt.position
@@ -742,10 +737,10 @@ void CameraController::handleFreeLook()
                              &freeLookClamp,
                              m_world->getObjectManager());
 
-  m_lookAt.position.X = originalLookAt.X + (m_lookAt.position.X - originalLookAt.X) / m_smoothness * 1_frame;
-  m_lookAt.position.Z = originalLookAt.Z + (m_lookAt.position.Z - originalLookAt.Z) / m_smoothness * 1_frame;
+  m_lookAt.position.X = originalLookAt.X + (m_lookAt.position.X - originalLookAt.X) / m_smoothingFactor * 1_frame;
+  m_lookAt.position.Z = originalLookAt.Z + (m_lookAt.position.Z - originalLookAt.Z) / m_smoothingFactor * 1_frame;
 
-  updatePosition(goal, m_smoothness);
+  updatePosition(goal, m_smoothingFactor);
 }
 
 void CameraController::handleEnemy()
@@ -782,29 +777,48 @@ void CameraController::handleEnemy()
       clampToCorners(distSq, a, b, c, d, e, f, g, h);
     },
     m_world->getObjectManager());
-  updatePosition(eye, m_smoothness);
+  updatePosition(eye, m_smoothingFactor);
 }
 
-std::unordered_set<const world::Portal*> CameraController::updateCinematic(const world::CinematicFrame& frame,
-                                                                           const bool ingame)
+bool CameraController::tickCinematic(const std::vector<world::CinematicFrame>& frames, const bool inGameCamera)
 {
-  const core::TRVec basePos = ingame ? m_cinematicPos : m_location.position;
-  const auto yRotOffset = ingame ? m_cinematicRot.Y : 0_deg;
-  const core::TRVec newLookAt = basePos + util::pitch(frame.lookAt, m_eyeRotation.Y + yRotOffset);
-  const core::TRVec newPos = basePos + util::pitch(frame.position, m_eyeRotation.Y + yRotOffset);
+  if(m_cinematicFrame.get<size_t>() >= frames.size() - 1)
+    return false;
+
+  m_cinematicFrame += 1_frame;
+
+  const auto& frame = frames[m_cinematicFrame.get<size_t>()];
+
+  m_previousLookAt = m_lookAt;
+  if(inGameCamera)
+    m_lookAt.position = m_cinematicPos + util::pitch(frame.lookAt, m_cinematicBaseRotation.Y + m_cinematicRot.Y);
+  else
+    m_lookAt.position = m_cinematicPos + util::pitch(frame.lookAt, m_cinematicBaseRotation.Y);
+  m_lookAt.updateRoom();
 
-  if(ingame)
+  m_previousLocation = m_location;
+  if(inGameCamera)
+    m_location.position = m_cinematicPos + util::pitch(frame.position, m_cinematicBaseRotation.Y + m_cinematicRot.Y);
+  else
+    m_location.position = m_cinematicPos + util::pitch(frame.position, m_cinematicBaseRotation.Y);
+  m_location.updateRoom();
+
+  m_previousCinematicRoll = std::exchange(m_cinematicRoll, frame.rotZ);
+  m_previousCinematicFov = std::exchange(m_cinematicFov, frame.fov);
+
+  if(m_cinematicFrame == 1_frame)
   {
-    m_lookAt.position = newLookAt;
-    m_location.position = newPos;
-    m_location.updateRoom();
+    m_previousLookAt = m_lookAt;
+    m_previousLocation = m_location;
+    m_previousCinematicRoll = m_cinematicRoll;
+    m_previousCinematicFov = m_cinematicFov;
   }
 
-  auto m = lookAt(newPos.toRenderSystem(), newLookAt.toRenderSystem(), {0, 1, 0});
-  m = rotate(m, frame.rotZ, -glm::vec3{m[2]});
-  m_camera->setViewMatrix(m);
-  m_camera->setFieldOfView(frame.fov);
+  return true;
+}
 
+std::unordered_set<const world::Portal*> CameraController::getWaterEntryPortals() const
+{
   // portal tracing doesn't work here because we always render each room.
   // assuming "sane" room layout here without overlapping rooms.
   std::unordered_set<const world::Portal*> result;
@@ -822,14 +836,16 @@ std::unordered_set<const world::Portal*> CameraController::updateCinematic(const
   return result;
 }
 
-CameraController::CameraController(const gsl::not_null<world::World*>& world,
+CameraController::CameraController(const gsl_lite::not_null<world::World*>& world,
                                    gslu::nn_shared<render::scene::Camera> camera,
                                    bool /*noLaraTag*/)
-    : Listener{gsl::not_null{world->getPresenter().getSoundEngine().get()}}
+    : Listener{gsl_lite::not_null{world->getEngine().getPresenter().getSoundEngine().get().get()}}
     , m_camera{std::move(camera)}
     , m_world{world}
-    , m_location{gsl::not_null{world->getRooms().data()}}
-    , m_lookAt{gsl::not_null{world->getRooms().data()}}
+    , m_location{gsl_lite::not_null{world->getRooms().data()}}
+    , m_previousLocation{gsl_lite::not_null{world->getRooms().data()}}
+    , m_lookAt{gsl_lite::not_null{world->getRooms().data()}}
+    , m_previousLookAt{gsl_lite::not_null{world->getRooms().data()}}
 {
 }
 
@@ -839,17 +855,17 @@ void CameraController::serialize(const serialization::Serializer<world::World>&
       S_NV("lookAt", m_lookAt),
       S_NV("mode", m_mode),
       S_NV("modifier", m_modifier),
-      S_NV("completelyFixed", m_isCompletelyFixed),
+      S_NV("wasFixedMode", m_wasFixedMode),
       S_NV("lookAtObject", serialization::ObjectReference{std::cref(m_lookAtObject)}),
       S_NV("previousLookAtObject", serialization::ObjectReference{std::cref(m_previousLookAtObject)}),
-      S_NV("bounce", m_bounce),
+      S_NV("shakeAmplitude", m_shakeAmplitude),
       S_NV("distance", m_distance),
-      S_NV("eyeRotation", m_eyeRotation),
+      S_NV("cinematicBaseRotation", m_cinematicBaseRotation),
       S_NV("rotationAroundLara", m_rotationAroundLara),
-      S_NV("smoothness", m_smoothness),
+      S_NV("smoothingFactor", m_smoothingFactor),
       S_NV("fixedCameraId", m_fixedCameraId),
       S_NV("currentFixedCameraId", m_currentFixedCameraId),
-      S_NV("camOverrideTimeout", m_camOverrideTimeout),
+      S_NV("overrideTimeout", m_overrideTimeout),
       S_NV("cinematicFrame", m_cinematicFrame),
       S_NV("cinematicPos", m_cinematicPos),
       S_NV("cinematicRot", m_cinematicRot));
@@ -857,26 +873,35 @@ void CameraController::serialize(const serialization::Serializer<world::World>&
 
 void CameraController::deserialize(const serialization::Deserializer<world::World>& ser)
 {
+  // TODO CE-378 remove member name migration
   ser(S_NV("location", m_location),
       S_NV("lookAt", m_lookAt),
       S_NV("mode", m_mode),
       S_NV("modifier", m_modifier),
-      S_NV("completelyFixed", m_isCompletelyFixed),
+      S_ANV("wasFixedMode", "completelyFixed", m_wasFixedMode),
       S_NV("lookAtObject", serialization::ObjectReference{std::ref(m_lookAtObject)}),
       S_NV("previousLookAtObject", serialization::ObjectReference{std::ref(m_previousLookAtObject)}),
-      S_NV("bounce", m_bounce),
+      S_ANV("shakeAmplitude", "bounce", m_shakeAmplitude),
       S_NV("distance", m_distance),
-      S_NV("eyeRotation", m_eyeRotation),
+      S_ANV("cinematicBaseRotation", "eyeRotation", m_cinematicBaseRotation),
       S_NV("rotationAroundLara", m_rotationAroundLara),
-      S_NV("smoothness", m_smoothness),
+      S_ANV("smoothingFactor", "smoothness", m_smoothingFactor),
       S_NV("fixedCameraId", m_fixedCameraId),
       S_NV("currentFixedCameraId", m_currentFixedCameraId),
-      S_NV("camOverrideTimeout", m_camOverrideTimeout),
+      S_ANV("overrideTimeout", "camOverrideTimeout", m_overrideTimeout),
       S_NV("cinematicFrame", m_cinematicFrame),
       S_NV("cinematicPos", m_cinematicPos),
       S_NV("cinematicRot", m_cinematicRot));
 }
 
+void CameraController::startCinematic(const core::TRVec& pos, const core::TRRotation& rot)
+{
+  m_mode = CameraMode::Cinematic;
+  m_cinematicFrame = 0_frame;
+  m_cinematicPos = pos;
+  m_cinematicRot = rot;
+}
+
 glm::vec3 CameraController::getPosition() const
 {
   return m_camera->getPosition();
@@ -891,4 +916,44 @@ glm::vec3 CameraController::getUpVector() const
 {
   return m_camera->getUpVector();
 }
-} // namespace engine
+
+void CameraController::interpolateCameraTransform(const float interTickFactor)
+{
+  std::optional<core::Radians> roll{};
+  core::Radians fov{};
+
+  if(m_mode == CameraMode::Cinematic)
+  {
+    roll = lerp(m_previousCinematicRoll, m_cinematicRoll, interTickFactor);
+    fov = lerp(m_previousCinematicFov, m_cinematicFov, interTickFactor);
+  }
+  else
+  {
+    fov = m_camera->getFieldOfViewY();
+  }
+
+  fixCameraJumpInterpolation();
+
+  auto m = lookAt(
+    glm::mix(m_previousLocation.position.toRenderSystem(), m_location.position.toRenderSystem(), interTickFactor),
+    glm::mix(m_previousLookAt.position.toRenderSystem(), m_lookAt.position.toRenderSystem(), interTickFactor),
+    core::RenderAxisUp);
+  if(roll.has_value())
+  {
+    m = rotate(m, roll.value().get<float>(), -glm::vec3{m[2]});
+  }
+  m_camera->setViewMatrix(m);
+  m_camera->setFieldOfView(fov);
+}
+
+void CameraController::fixCameraJumpInterpolation()
+{
+  static constexpr auto JumpThreshold = 256_len;
+  if(length(m_location.position - m_previousLocation.position) >= JumpThreshold
+     || length(m_lookAt.position - m_previousLookAt.position) >= JumpThreshold)
+  {
+    m_previousLocation.position = m_location.position;
+    m_previousLookAt.position = m_lookAt.position;
+  }
+}
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/cameracontroller.h b/src/engine/cameracontroller.h
index 79ff07a73..b48d3ea40 100644
--- a/src/engine/cameracontroller.h
+++ b/src/engine/cameracontroller.h
@@ -12,7 +12,7 @@
 
 #include <cstdint>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <unordered_set>
@@ -44,12 +44,18 @@ class Object;
 
 enum class CameraMode : uint8_t
 {
+  /// Camera follows Lara.
   Chase,
+  /// Camera is fixed at a position.
   FixedPosition,
+  /// User controls the camera while it moves around Lara.
   FreeLook,
+  /// Like Chase, but at a farther distance, and looking at the focused enemy
   Combat,
+  /// Camera is fully driven by a fixed position/angle sequence, relative to Lara
   Cinematic,
-  HeavyFixedPosition //!< like FixedPosition, but disables camera command sequence handling
+  /// Like FixedPosition, but disables camera command sequence handling
+  HeavyFixedPosition
 };
 
 enum class CameraModifier : uint8_t
@@ -62,32 +68,38 @@ enum class CameraModifier : uint8_t
 
 class CameraController final : public audio::Listener
 {
-private:
   gslu::nn_shared<render::scene::Camera> m_camera;
 
-  gsl::not_null<world::World*> m_world;
+  gsl_lite::not_null<world::World*> m_world;
 
   //! @brief Global camera position.
   Location m_location;
+  Location m_previousLocation;
   //! @brief The point the camera moves around.
   Location m_lookAt;
+  Location m_previousLookAt;
   CameraMode m_mode = CameraMode::Chase;
 
   CameraModifier m_modifier = CameraModifier::None;
 
-  bool m_isCompletelyFixed = false;
+  //! @brief Tracks if the previous logic tick used a fixed camera mode.
+  //! @note Used to determine if we should snap or smooth the camera when transitioning between modes.
+  bool m_wasFixedMode = false;
 
   /**
-     * @brief If <0, bounce randomly around +/- @c m_bounce/2, increasing value by 5 each frame; if >0, do a single Y bounce downwards by @c m_bounce.
-     */
-  core::Length m_bounce = 0_len;
+* @brief If <0, shake randomly around +/- @c m_shakeAmplitude/2, increasing value by 5 each frame; if >0, do a single Y shake downwards by @c m_shakeAmplitude.
+*/
+  core::Length m_shakeAmplitude = 0_len;
 
   //! @brief Goal distance between the pivot point and the camera.
   core::Length m_distance = core::DefaultCameraLaraDistance;
 
-  core::TRRotation m_eyeRotation;
+  //! @brief Base rotation for cinematic frames (captured from Lara at start of cinematic).
+  core::TRRotation m_cinematicBaseRotation;
 
-  //! @brief Global camera rotation.
+  //! @brief Rotation of the camera around the look-at point.
+  //! @note In Chase mode, this is an offset from the object's rotation.
+  //!       In FreeLook/Combat mode, this is an absolute rotation.
   core::TRRotation m_rotationAroundLara;
 
   //! @brief An object to point the camera to.
@@ -95,19 +107,40 @@ class CameraController final : public audio::Listener
   std::shared_ptr<objects::Object> m_lookAtObject = nullptr;
   std::shared_ptr<objects::Object> m_previousLookAtObject = nullptr;
   //! @brief Movement smoothness for adjusting the pivot position.
-  core::Frame m_smoothness = 8_frame;
+  core::Frame m_smoothingFactor = 8_frame;
   int m_fixedCameraId = -1;
   int m_currentFixedCameraId = -1;
-  core::Frame m_camOverrideTimeout{-1_frame};
+  core::Frame m_overrideTimeout{-1_frame};
+
+  core::Frame m_cinematicFrame = 0_frame;
+  core::TRVec m_cinematicPos{0_len, 0_len, 0_len};
+  core::TRRotation m_cinematicRot;
+  core::Radians m_previousCinematicRoll{0.0f};
+  core::Radians m_cinematicRoll{0.0f};
+  core::Radians m_previousCinematicFov{core::DefaultFov};
+  core::Radians m_cinematicFov{core::DefaultFov};
+
+  void handleFixedCamera();
+
+  core::Length clampToVerticalBounds(Location& goal, const core::Length& margin) const;
+
+  void updatePosition(const Location& goal, const core::Frame& smoothingFactor);
+
+  void chaseObject(const objects::Object& object);
+
+  void handleFreeLook();
+  void handleEnemy();
+ void fixCameraJumpInterpolation();
 
 public:
-  explicit CameraController(const gsl::not_null<world::World*>& world, gslu::nn_shared<render::scene::Camera> camera);
+  explicit CameraController(const gsl_lite::not_null<world::World*>& world,
+                            gslu::nn_shared<render::scene::Camera> camera);
 
-  explicit CameraController(const gsl::not_null<world::World*>& world,
+  explicit CameraController(const gsl_lite::not_null<world::World*>& world,
                             gslu::nn_shared<render::scene::Camera> camera,
                             bool noLaraTag);
 
-  const gsl::not_null<world::World*>& getWorld() const noexcept
+  const gsl_lite::not_null<world::World*>& getWorld() const noexcept
   {
     return m_world;
   }
@@ -118,15 +151,15 @@ class CameraController final : public audio::Listener
 
   void setRotationAroundLaraY(const core::Angle& y) noexcept;
 
-  void setEyeRotation(const core::Angle& x, const core::Angle& y) noexcept
+  void setCinematicBaseRotation(const core::Angle& x, const core::Angle& y) noexcept
   {
-    m_eyeRotation.X = x;
-    m_eyeRotation.Y = y;
+    m_cinematicBaseRotation.X = x;
+    m_cinematicBaseRotation.Y = y;
   }
 
-  const core::TRRotation& getEyeRotation() const noexcept
+  const core::TRRotation& getCinematicBaseRotation() const noexcept
   {
-    return m_eyeRotation;
+    return m_cinematicBaseRotation;
   }
 
   void setDistance(const core::Length& d) noexcept
@@ -153,7 +186,7 @@ class CameraController final : public audio::Listener
 
   void handleCommandSequence(const floordata::FloorDataValue* cmdSequence);
 
-  std::unordered_set<const world::Portal*> update();
+  void updateGameLogic(bool inGameCamera);
 
   void setMode(const CameraMode mode) noexcept
   {
@@ -191,14 +224,19 @@ class CameraController final : public audio::Listener
     return m_location;
   }
 
+  const core::TRVec& getCinematicPos() const noexcept
+  {
+    return m_cinematicPos;
+  }
+
   void setLocation(const Location& location)
   {
     m_location = location;
   }
 
-  void setBounce(const core::Length& bounce) noexcept
+  void setShake(const core::Length& amplitude) noexcept
   {
-    m_bounce = bounce;
+    m_shakeAmplitude = amplitude;
   }
 
   const auto& getCamera() const noexcept
@@ -206,27 +244,15 @@ class CameraController final : public audio::Listener
     return m_camera;
   }
 
-  std::unordered_set<const world::Portal*> updateCinematic(const world::CinematicFrame& frame, bool ingame);
+  bool tickCinematic(const std::vector<world::CinematicFrame>& frames, bool inGameCamera);
+  std::unordered_set<const world::Portal*> getWaterEntryPortals() const;
+  std::unordered_set<const world::Portal*> traceWaterSurfacePortals() const;
+
+  void interpolateCameraTransform(float interTickFactor);
 
   void serialize(const serialization::Serializer<world::World>& ser) const;
   void deserialize(const serialization::Deserializer<world::World>& ser);
 
-  core::Frame m_cinematicFrame = 0_frame;
-  core::TRVec m_cinematicPos{0_len, 0_len, 0_len};
-  core::TRRotation m_cinematicRot;
-
-private:
-  std::unordered_set<const world::Portal*> tracePortals();
-
-  void handleFixedCamera();
-
-  core::Length moveIntoBox(Location& goal, const core::Length& margin) const;
-
-  void updatePosition(const Location& goal, const core::Frame& smoothFactor);
-
-  void chaseObject(const objects::Object& object);
-
-  void handleFreeLook();
-  void handleEnemy();
+  void startCinematic(const core::TRVec& pos, const core::TRRotation& rot);
 };
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/collisioninfo.cpp b/src/engine/collisioninfo.cpp
index 8ff192eed..a85968cb0 100644
--- a/src/engine/collisioninfo.cpp
+++ b/src/engine/collisioninfo.cpp
@@ -23,7 +23,7 @@
 #include "world/world.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <set>
 #include <tuple>
 
@@ -49,8 +49,7 @@ namespace
 {
   auto result = bbox;
 
-  const auto axis = axisFromAngle(angle);
-  switch(axis)
+  switch(axisFromAngle(angle))
   {
   case core::Axis::Deg0:
     // nothing to do
@@ -80,14 +79,15 @@ namespace
   return min < max ? -min : max;
 }
 
-std::tuple<int8_t, int8_t> getFloorSlantInfo(gsl::not_null<const world::Sector*> sector, const core::TRVec& position)
+std::tuple<int8_t, int8_t> getFloorSlantInfo(gsl_lite::not_null<const world::Sector*> sector,
+                                             const core::TRVec& position)
 {
   while(sector->roomBelow != nullptr)
   {
-    sector = gsl::not_null{sector->roomBelow->getSectorByAbsolutePosition(position)};
+    sector = gsl_lite::not_null{sector->roomBelow->getSectorByAbsolutePosition(position)};
   }
 
-  static const auto zero = std::make_tuple(int8_t{0}, int8_t{0});
+  static constexpr auto zero = std::make_tuple(int8_t{0}, int8_t{0});
 
   if(position.Y + core::QuarterSectorSize * 2 < sector->floorHeight)
     return zero;
@@ -97,7 +97,8 @@ std::tuple<int8_t, int8_t> getFloorSlantInfo(gsl::not_null<const world::Sector*>
     return zero;
 
   const auto fd = sector->floorData[1];
-  return std::make_tuple(gsl::narrow_cast<int8_t>(fd.get() & 0xffu), gsl::narrow_cast<int8_t>(fd.get() >> 8u));
+  return std::make_tuple(gsl_lite::narrow_cast<int8_t>(fd.get() & 0xffu),
+                         gsl_lite::narrow_cast<int8_t>(fd.get() >> 8u));
 }
 } // namespace
 
@@ -114,9 +115,9 @@ void CollisionInfo::initHeightInfo(const core::TRVec& laraPos, const world::Worl
   std::tie(floorSlantX, floorSlantZ) = getFloorSlantInfo(
     currentSector, core::TRVec{laraPos.X, world.getObjectManager().getLara().m_state.location.position.Y, laraPos.Z});
 
-  core::Length frontX = 0_len, frontZ = 0_len;
-  core::Length frontLeftX = 0_len, frontLeftZ = 0_len;
-  core::Length frontRightX = 0_len, frontRightZ = 0_len;
+  auto frontX = 0_len, frontZ = 0_len;
+  auto frontLeftX = 0_len, frontLeftZ = 0_len;
+  auto frontRightX = 0_len, frontRightZ = 0_len;
 
   switch(facingAxis)
   {
@@ -276,12 +277,12 @@ void CollisionInfo::initHeightInfo(const core::TRVec& laraPos, const world::Worl
   }
 }
 
-std::set<gsl::not_null<const world::Room*>> CollisionInfo::collectTouchingRooms(const core::TRVec& position,
-                                                                                const core::Length& radius,
-                                                                                const core::Length& height,
-                                                                                const world::World& world)
+std::set<gsl_lite::not_null<const world::Room*>> CollisionInfo::collectTouchingRooms(const core::TRVec& position,
+                                                                                     const core::Length& radius,
+                                                                                     const core::Length& height,
+                                                                                     const world::World& world)
 {
-  std::set<gsl::not_null<const world::Room*>> result;
+  std::set<gsl_lite::not_null<const world::Room*>> result;
   auto room = world.getObjectManager().getLara().m_state.location.room;
   result.emplace(room);
 
@@ -390,4 +391,4 @@ bool CollisionInfo::checkStaticMeshCollisions(const core::TRVec& objectPos,
 
   return hasStaticMeshCollision;
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/collisioninfo.h b/src/engine/collisioninfo.h
index 08e81c51e..47e913bf6 100644
--- a/src/engine/collisioninfo.h
+++ b/src/engine/collisioninfo.h
@@ -8,7 +8,7 @@
 #include "type_safe/flag_set.hpp"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp> // IWYU pragma: keep
+#include <gsl-lite/gsl-lite.hpp> // IWYU pragma: keep
 #include <set>
 
 namespace engine::world
@@ -43,9 +43,9 @@ struct CollisionInfo
   };
 
   using PolicyFlagSet = type_safe::flag_set<PolicyFlags>;
-  static constexpr const type_safe::flag_combo<PolicyFlags> SlopeBlockingPolicy
+  static constexpr type_safe::flag_combo<PolicyFlags> SlopeBlockingPolicy
     = PolicyFlags::SlopesAreWalls | PolicyFlags::SlopesArePits;
-  static constexpr const type_safe::flag_combo<PolicyFlags> SpazPushPolicy
+  static constexpr type_safe::flag_combo<PolicyFlags> SpazPushPolicy
     = PolicyFlags::EnableBaddiePush | PolicyFlags::EnableSpaz;
 
   AxisColl collisionType = AxisColl::None;
@@ -70,13 +70,13 @@ struct CollisionInfo
 
   void initHeightInfo(const core::TRVec& laraPos, const world::World& world, const core::Length& height);
 
-  static std::set<gsl::not_null<const world::Room*>> collectTouchingRooms(const core::TRVec& position,
-                                                                          const core::Length& radius,
-                                                                          const core::Length& height,
-                                                                          const world::World& world);
+  static std::set<gsl_lite::not_null<const world::Room*>> collectTouchingRooms(const core::TRVec& position,
+                                                                               const core::Length& radius,
+                                                                               const core::Length& height,
+                                                                               const world::World& world);
 
   bool checkStaticMeshCollisions(const core::TRVec& objectPos,
                                  const core::Length& objectHeight,
                                  const world::World& world);
 };
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/controllerbuttons.cpp b/src/engine/controllerbuttons.cpp
index 5b704bae2..217ded0f4 100644
--- a/src/engine/controllerbuttons.cpp
+++ b/src/engine/controllerbuttons.cpp
@@ -23,7 +23,7 @@
 #include <filesystem>
 #include <gl/cimgwrapper.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 #include <memory>
@@ -55,7 +55,7 @@ ControllerLayouts loadControllerButtonIcons(render::MultiTextureAtlas& atlases,
   {
     int context{};
     serialization::YAMLDocument<true> doc{configFile};
-    doc.deserialize("layouts", gsl::not_null{&context}, layouts);
+    doc.deserialize("layouts", gsl_lite::not_null{&context}, layouts);
   }
 
   ControllerLayouts controllerLayouts;
@@ -74,8 +74,8 @@ ControllerLayouts loadControllerButtonIcons(render::MultiTextureAtlas& atlases,
       const auto atlasLoc
         = atlases.isOnlyLayout() ? atlases.put(glm::ivec2{src.width(), src.height()}) : atlases.put(src);
       const glm::vec2 uvLoc
-        = (glm::vec2{atlasLoc.second} + glm::vec2{0.5f, 0.5f}) / gsl::narrow_cast<float>(atlases.getSize());
-      const glm::vec2 uvSize = glm::vec2{src.width(), src.height()} / gsl::narrow_cast<float>(atlases.getSize());
+        = (glm::vec2{atlasLoc.second} + glm::vec2{0.5f, 0.5f}) / gsl_lite::narrow_cast<float>(atlases.getSize());
+      const glm::vec2 uvSize = glm::vec2{src.width(), src.height()} / gsl_lite::narrow_cast<float>(atlases.getSize());
       static constexpr int YOffset = -ui::FontHeight + 1;
       world::Sprite sprite{atlasLoc.first,
                            uvLoc,
@@ -128,4 +128,4 @@ ControllerLayouts loadControllerButtonIcons(render::MultiTextureAtlas& atlases,
 
   return controllerLayouts;
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/displaysettings.cpp b/src/engine/displaysettings.cpp
index e4f3ed514..359723fa6 100644
--- a/src/engine/displaysettings.cpp
+++ b/src/engine/displaysettings.cpp
@@ -7,12 +7,12 @@
 
 namespace engine
 {
-void DisplaySettings::serialize(const serialization::Serializer<engine::EngineConfig>& ser) const
+void DisplaySettings::serialize(const serialization::Serializer<EngineConfig>& ser) const
 {
   ser(S_NV("ghost", ghost), S_NV("showCoopNames", showCoopNames));
 }
 
-void DisplaySettings::deserialize(const serialization::Deserializer<engine::EngineConfig>& ser)
+void DisplaySettings::deserialize(const serialization::Deserializer<EngineConfig>& ser)
 {
   ser(S_NVO("ghost", std::ref(ghost)), S_NVO("showCoopNames", std::ref(showCoopNames)));
 }
diff --git a/src/engine/displaysettings.h b/src/engine/displaysettings.h
index eca1e4f1a..4c584ecf1 100644
--- a/src/engine/displaysettings.h
+++ b/src/engine/displaysettings.h
@@ -11,7 +11,7 @@ struct DisplaySettings
   bool ghost = false;
   bool showCoopNames = true;
 
-  void serialize(const serialization::Serializer<engine::EngineConfig>& ser) const;
-  void deserialize(const serialization::Deserializer<engine::EngineConfig>& ser);
+  void serialize(const serialization::Serializer<EngineConfig>& ser) const;
+  void deserialize(const serialization::Deserializer<EngineConfig>& ser);
 };
 } // namespace engine
diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index ac43022ac..7827187a1 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -20,6 +20,8 @@
 #include "ghostmanager.h"
 #include "hid/actions.h"
 #include "hid/inputhandler.h"
+#include "levelloop.h"
+#include "levelloopresult.h"
 #include "loader/trx/trx.h"
 #include "location.h"
 #include "menu/menudisplay.h"
@@ -34,6 +36,7 @@
 #include "render/scene/mesh.h"
 #include "render/scene/node.h"
 #include "render/scene/rendercontext.h"
+#include "render/scene/scenegraph.h"
 #include "render/scene/sprite.h"
 #include "render/scene/translucency.h"
 #include "script/reflection.h"
@@ -78,12 +81,13 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <ios>
 #include <locale>
 #include <memory>
 #include <optional>
+#include <ranges>
 #include <set>
 #include <sstream>
 #include <stdexcept>
@@ -94,143 +98,76 @@ namespace engine
 {
 namespace
 {
-const gsl::czstring QuicksaveFilename = "quicksave.yaml";
+const auto QuicksaveFilename = "quicksave.yaml";
 
-void drawAmmoWidget(ui::Ui& ui, const ui::TRFont& trFont, const world::World& world, core::Frame& ammoDisplayDuration)
+bool showLevelStats(Throttler& throttler, const std::shared_ptr<Presenter>& presenter, world::World& world)
 {
-  if(const auto handStatus = world.getObjectManager().getLara().getHandStatus();
-     handStatus != engine::objects::HandStatus::Combat)
-  {
-    ammoDisplayDuration = 0_frame;
-  }
-  else
-  {
-    static constexpr auto StaticDuration = core::FrameRate * 1_sec * 2 / 3;
-    static constexpr auto TransitionDuration = core::FrameRate * 1_sec / 2;
-
-    ammoDisplayDuration = std::min(ammoDisplayDuration + 1_frame, StaticDuration + TransitionDuration);
-
-    auto drawAmmoText = [&ui, &world, &trFont](float bias)
-    {
-      const auto& ammo = world.getPlayer().getInventory().getAmmo(world.getPlayer().selectedWeaponType);
-      auto text = ui::Text{ui::makeAmmoString(ammo.getDisplayString())};
-      const auto margin = ui::FontHeight / 2 + glm::mix(ui::FontHeight, 0, bias);
-      const auto targetPos
-        = glm::ivec2{ui.getSize().x - ui::FontHeight - 1 - margin - text.getWidth(), ui::FontHeight * 2 + margin};
-      const auto center = glm::ivec2{(ui.getSize().x - text.getWidth()) / 2, ui.getSize().y * 30 / 100};
-      const auto pos = glm::mix(center, targetPos, bias);
-      drawBox(text, ui, pos, margin, gl::SRGBA8{0, 0, 0, glm::mix(128, 224, bias)});
-      text.draw(ui, trFont, pos, 1, glm::mix(0.75f, 1.0f, bias));
-    };
-
-    switch(world.getPlayer().selectedWeaponType)
-    {
-    case engine::WeaponType::None:
-    case engine::WeaponType::Pistols:
-      break;
-    case engine::WeaponType::Shotgun:
-    case engine::WeaponType::Magnums:
-    case engine::WeaponType::Uzis:
-      drawAmmoText(glm::smoothstep(
-        0.0f,
-        1.0f,
-        std::clamp(
-          (ammoDisplayDuration - StaticDuration).cast<float>() / TransitionDuration.cast<float>(), 0.0f, 1.0f)));
-      break;
-    }
-  }
-}
-
-void drawBugReportMessage(ui::Ui& ui, const ui::TRFont& trFont)
-{
-  auto text = ui::Text{/* translators: TR charmap encoding */ _("Bug Report Saved")};
-  const auto pos = glm::ivec2{(ui.getSize().x - text.getWidth()) / 2, ui.getSize().y / 2 - ui::FontHeight};
-  text.draw(ui, trFont, pos);
-}
-
-void drawSaveReminder(ui::Ui& ui, const ui::TRFont& trFont)
-{
-  auto text = ui::Text{/* translators: TR charmap encoding */ _("Save Game")};
-  const auto pos = glm::ivec2{(ui.getSize().x - text.getWidth()) / 2, ui::FontHeight};
-  text.draw(ui, trFont, pos);
-}
-
-void makeScreenshot(const Presenter& presenter, const std::filesystem::path& userDataPath)
-{
-  auto img = presenter.takeScreenshot();
-  if(!std::filesystem::is_directory(userDataPath / "screenshots"))
-    std::filesystem::create_directories(userDataPath / "screenshots");
-
-  auto filename = util::getCurrentHumanReadableTimestamp() + ".png";
-  img.savePng(userDataPath / "screenshots" / filename, false);
-}
-
-bool showLevelStats(const std::shared_ptr<Presenter>& presenter,
-                    world::World& world,
-                    const std::filesystem::path& userDataPath)
-{
-  static constexpr const auto BlendDuration = 30_frame;
-  auto currentBlendDuration = 0_frame;
+  static constexpr auto BlendDuration = 30_tick;
+  auto currentBlendDuration = 0_tick;
 
   const ui::LevelStats stats{world.getTitle(), world.getTotalSecrets(), world.getPlayerPtr(), presenter};
   const ui::DetailedLevelStats detailedStats{world};
   bool detailed = false;
 
-  Throttler throttler;
+  throttler.reset();
   while(true)
   {
-    throttler.wait();
     if(presenter->shouldClose())
     {
       return false;
     }
 
-    if(!presenter->preFrame())
+    if(!presenter->beginFrame())
     {
       continue;
     }
 
-    if(presenter->getInputHandler().hasDebouncedAction(hid::Action::SecondaryInteraction))
-      detailed = !detailed;
+    presenter->updateSoundEngine();
+    throttler.tick();
+
+    if(throttler.isTimeForLogic())
+    {
+      presenter->getInputHandler().update();
+
+      if(presenter->getInputHandler().hasDebouncedAction(hid::Action::SecondaryInteraction))
+        detailed = !detailed;
+    }
 
-    ui::Ui ui{
-      presenter->getMaterialManager()->getUi(), world.getWorldGeometry().getPalette(), presenter->getUiViewport()};
+    ui::Ui ui{presenter->getRenderSystem().getMaterialManager().getUi(),
+              world.getWorldGeometry().getPalette(),
+              presenter->getUiViewport()};
     ui.drawBox({0, 0}, ui.getSize(), gl::SRGBA8{0, 0, 0, ui::DefaultBackgroundAlpha});
     if(detailed)
       detailedStats.draw(ui, *presenter, false);
     else
       stats.draw(ui);
 
+    if(throttler.isTimeForLogic())
     {
-      const auto portals = world.getCameraController().update();
-      if(const auto lara = world.getObjectManager().getLaraPtr())
-        lara->m_state.location.room->node->setVisible(true);
-      presenter->renderWorld(world.getRooms(), world.getCameraController(), portals, world);
+      world.getCameraController().updateGameLogic(true);
     }
-    presenter->renderScreenOverlay();
-
-    if(currentBlendDuration < BlendDuration)
-      currentBlendDuration += 1_frame;
-
-    presenter->renderUi(ui, currentBlendDuration.cast<float>() / BlendDuration.cast<float>());
-    presenter->updateSoundEngine();
+    if(const auto lara = world.getObjectManager().getLaraPtr(); lara != nullptr)
+      lara->m_state.location.room->node->setVisible(true);
+    presenter->renderWorldGeometryFramebuffers(
+      world.getRooms(), world.getCameraController(), world.getCameraController().traceWaterSurfacePortals(), world);
+    if(throttler.isTimeForLogic() && currentBlendDuration < BlendDuration)
+      currentBlendDuration += 1_tick;
+
+    presenter->renderUiToBackbuffer(ui, currentBlendDuration.cast<float>() / BlendDuration.cast<float>());
     presenter->swapBuffers();
 
-    if(presenter->getInputHandler().hasDebouncedAction(hid::Action::Screenshot))
+    if(throttler.isTimeForLogic())
     {
-      makeScreenshot(*presenter, userDataPath);
-      throttler.reset();
+      if(presenter->getInputHandler().hasDebouncedAction(hid::Action::Action))
+        break;
     }
-
-    if(presenter->getInputHandler().hasDebouncedAction(hid::Action::Action))
-      break;
   }
 
   return true;
 }
 
 void updateGhostRoom(const std::vector<world::Room>& rooms,
-                     const gsl::not_null<std::shared_ptr<ghosting::GhostModel>>& ghost)
+                     const gsl_lite::not_null<std::shared_ptr<ghosting::GhostModel>>& ghost)
 {
   for(const auto& room : rooms)
   {
@@ -276,7 +213,7 @@ void updateRemoteGhosts(world::World& world, GhostManager& ghostManager, const n
       continue;
 
     for(const auto v : dataVec)
-      tmp += gsl::narrow_cast<char>(v);
+      tmp += gsl_lite::narrow_cast<char>(v);
     std::istringstream stateDataStream{tmp, std::ios::in | std::ios::binary};
     ghostFrame.read(stateDataStream);
 
@@ -293,39 +230,41 @@ void updateRemoteGhosts(world::World& world, GhostManager& ghostManager, const n
     {
       it = ghostManager.getRemoteModels().emplace(peerId, std::make_shared<ghosting::GhostModel>()).first;
 
-      static constexpr const glm::ivec2 nameTextureSize{512, 128};
-      static constexpr const int nameFontSize = 48;
+      static const glm::ivec2 nameTextureSize{512, 128};
+      static constexpr int nameFontSize = 48;
 
       gl::Image<gl::ScalarByte> img{nameTextureSize, nullptr};
 
-      const auto fontMeasurement = world.getPresenter().getGhostNameFont().measure(ghostUsername, nameFontSize);
+      const auto fontMeasurement
+        = world.getEngine().getPresenter().getGhostNameFont().measure(ghostUsername, nameFontSize);
       BOOST_LOG_TRIVIAL(debug) << "Font measurement x=" << fontMeasurement.first.x << ", y=" << fontMeasurement.first.y
                                << " / x=" << fontMeasurement.second.x << ", y=" << fontMeasurement.second.y;
-      world.getPresenter().getGhostNameFont().drawText(
+      world.getEngine().getPresenter().getGhostNameFont().drawText(
         img,
         ghostUsername,
         {(nameTextureSize.x - fontMeasurement.second.x) / 2, nameTextureSize.y - 1 + fontMeasurement.first.y},
         nameFontSize);
 
-      auto texture = gsl::make_shared<gl::Texture2D<gl::ScalarByte>>(nameTextureSize, 8, "ghost-name");
+      auto texture = gsl_lite::make_shared<gl::Texture2D<gl::ScalarByte>>(nameTextureSize, 8, "ghost-name");
       texture->assign(img.getData());
       texture->generateMipmaps();
-      auto nameHandle = gsl::make_shared<gl::TextureHandle<gl::Texture2D<gl::ScalarByte>>>(
+      auto nameHandle = gsl_lite::make_shared<gl::TextureHandle<gl::Texture2D<gl::ScalarByte>>>(
         texture,
-        gsl::make_unique<gl::Sampler>("ghost-name" + gl::SamplerSuffix) | set(gl::api::TextureMagFilter::Linear)
+        gsl_lite::make_unique<gl::Sampler>("ghost-name" + gl::SamplerSuffix) | set(gl::api::TextureMagFilter::Linear)
           | set(gl::api::TextureMinFilter::Linear));
 
-      auto mesh = render::scene::createSpriteMesh(-nameTextureSize.x / 2.0f,
-                                                  0,
-                                                  nameTextureSize.x / 2.0f,
-                                                  gsl::narrow_cast<float>(nameTextureSize.y),
-                                                  {0.0f, 1.0f},
-                                                  {1.0f, 0.0f},
-                                                  render::material::RenderMode::FullNonOpaque,
-                                                  world.getPresenter().getMaterialManager()->getGhostName(),
-                                                  0,
-                                                  "ghost-name");
-      auto nameNode = gsl::make_shared<render::scene::Node>("ghost-name");
+      auto mesh = render::scene::createSpriteMesh(
+        -nameTextureSize.x / 2.0f,
+        0,
+        nameTextureSize.x / 2.0f,
+        gsl_lite::narrow_cast<float>(nameTextureSize.y),
+        {0.0f, 1.0f},
+        {1.0f, 0.0f},
+        render::material::RenderMode::FullNonOpaque,
+        world.getEngine().getPresenter().getRenderSystem().getMaterialManager().getGhostName(),
+        0,
+        "ghost-name");
+      auto nameNode = gsl_lite::make_shared<render::scene::Node>("ghost-name");
       nameNode->setRenderable(mesh);
       nameNode->setLocalMatrix(glm::translate(glm::mat4{1.0f}, glm::vec3{0.0f, core::LaraWalkHeight.get(), 0.0f}));
       nameNode->bind("u_color",
@@ -342,20 +281,20 @@ void updateRemoteGhosts(world::World& world, GhostManager& ghostManager, const n
       setParent(nameNode, it->second);
     }
 
-    const gsl::not_null remoteGhost{it->second};
+    const gsl_lite::not_null remoteGhost{it->second};
     remoteGhost->apply(world, ghostFrame);
     remoteGhost->setColor(glColor);
     updateGhostRoom(world.getRooms(), remoteGhost);
   }
 
   std::set<uint64_t> ghostsToDrop;
-  for(const auto& [id, _] : ghostManager.getRemoteModels())
+  for(const auto& id : ghostManager.getRemoteModels() | std::views::keys)
     ghostsToDrop.emplace(id);
-  for(const auto& [id, _] : states)
+  for(const auto& id : states | std::views::keys)
     ghostsToDrop.erase(id);
   for(const auto& id : ghostsToDrop)
   {
-    setParent(gsl::not_null{ghostManager.getRemoteModels().at(id)}, nullptr);
+    setParent(gsl_lite::not_null{ghostManager.getRemoteModels().at(id)}, nullptr);
     ghostManager.getRemoteModels().erase(id);
   }
 }
@@ -371,7 +310,7 @@ Engine::Engine(std::filesystem::path userDataPath,
     , m_engineDataPath{engineDataPath}
     , m_gameflowId{gameflowId}
     , m_scriptEngine{engineDataPath / "gameflows" / gameflowId}
-    , m_engineConfig{gsl::make_shared<EngineConfig>()}
+    , m_engineConfig{gsl_lite::make_shared<EngineConfig>()}
 {
   {
     const auto invalid = m_scriptEngine.getGameflow().getInvalidFilepaths(getAssetDataPath());
@@ -394,15 +333,22 @@ Engine::Engine(std::filesystem::path userDataPath,
   if(std::filesystem::is_regular_file(m_userDataPath / "config.yaml"))
   {
     serialization::YAMLDocument<true> doc{m_userDataPath / "config.yaml"};
-    doc.deserialize("config", gsl::not_null{m_engineConfig.get().get()}, *m_engineConfig);
+    doc.deserialize("config", gsl_lite::not_null{m_engineConfig.get().get()}, *m_engineConfig);
   }
 
-  m_presenter
-    = std::make_shared<Presenter>(m_engineDataPath, resolution, m_engineConfig->renderSettings, borderlessFullscreen);
+  m_presenter = std::make_shared<Presenter>(m_engineDataPath,
+                                            resolution,
+                                            m_engineConfig->renderSettings,
+                                            borderlessFullscreen,
+                                            [this]()
+                                            {
+                                              return m_throttler.getInterTickFactor();
+                                            });
   if(gl::hasAnisotropicFilteringExtension()
-     && gsl::narrow_cast<float>(m_engineConfig->renderSettings.anisotropyLevel) > gl::getMaxAnisotropyLevel())
+     && gsl_lite::narrow_cast<float>(m_engineConfig->renderSettings.anisotropyLevel) > gl::getMaxAnisotropyLevel())
   {
-    m_engineConfig->renderSettings.anisotropyLevel = gsl::narrow<uint32_t>(std::llround(gl::getMaxAnisotropyLevel()));
+    m_engineConfig->renderSettings.anisotropyLevel
+      = gsl_lite::narrow<uint32_t>(std::llround(gl::getMaxAnisotropyLevel()));
   }
 
   applySettings();
@@ -413,42 +359,29 @@ Engine::Engine(std::filesystem::path userDataPath,
 Engine::~Engine()
 {
   serialization::YAMLDocument<false> doc{m_userDataPath / "config.yaml"};
-  doc.serialize("config", gsl::not_null{m_engineConfig.get().get()}, *m_engineConfig);
+  doc.serialize("config", gsl_lite::not_null{m_engineConfig.get().get()}, *m_engineConfig);
   doc.write();
 }
 
-std::pair<RunResult, std::optional<size_t>> Engine::run(world::World& world, bool isCutscene, bool allowSave)
+std::pair<LevelLoopResult, std::optional<size_t>> Engine::runLevel(world::World& world, const bool allowSave)
 {
-  if(!isCutscene)
-  {
-    world.getObjectManager().getLara().m_state.health = world.getPlayer().laraHealth;
-    world.getObjectManager().getLara().initWeaponAnimData();
-  }
+  world.getObjectManager().getLara().m_state.health = world.getPlayer().laraHealth;
+  world.getObjectManager().getLara().initWeaponAnimData();
 
   const bool godMode = m_scriptEngine.getGameflow().isGodMode();
   const bool allAmmoCheat = m_scriptEngine.getGameflow().hasAllAmmoCheat();
 
   applySettings();
-  std::shared_ptr<menu::MenuDisplay> menu;
-  Throttler throttler;
-  core::Frame laraDeadTime = 0_frame;
-
-  core::Frame runtime = 0_frame;
-  static constexpr auto BlendInDuration = core::FrameRate * 2_sec;
-  core::Frame ammoDisplayDuration = 0_frame;
-  core::Frame bugReportSavedDuration = 0_frame;
+  m_throttler.reset();
 
   const auto ghostRoot = m_userDataPath / "ghosts" / m_gameflowId;
   std::filesystem::create_directories(ghostRoot);
-  GhostManager ghostManager{ghostRoot / (world.getLevelFilename().stem().replace_extension(".rec")), world};
+  GhostManager ghostManager{ghostRoot / world.getLevelFilename().stem().replace_extension(".rec"), world};
 
   network::HauntedCoopClient coop{world.getEngine().getGameflowId(), world.getLevelFilename().stem().string()};
   coop.start();
-  const auto coopStop = gsl::final_action(
-    [&coop]()
-    {
-      coop.stop();
-    });
+
+  LevelLoop gameLoop{gsl_lite::not_null{m_presenter}, m_userDataPath};
 
   while(true)
   {
@@ -458,169 +391,58 @@ std::pair<RunResult, std::optional<size_t>> Engine::run(world::World& world, boo
 
     if(m_presenter->shouldClose())
     {
-      return {RunResult::ExitGame, std::nullopt};
+      return {LevelLoopResult::ExitGame, std::nullopt};
     }
 
     if(world.levelFinished())
     {
-      if(!isCutscene && allowSave)
-      {
-        if(!showLevelStats(m_presenter, world, m_userDataPath))
-          return {RunResult::ExitGame, std::nullopt};
-
-        if(m_engineConfig->displaySettings.ghost && !ghostManager.askGhostSave(*m_presenter, world))
-          return {RunResult::ExitGame, std::nullopt};
-      }
+      if(!showLevelStats(m_throttler, m_presenter, world))
+        return {LevelLoopResult::ExitGame, std::nullopt};
 
-      return {RunResult::NextLevel, std::nullopt};
+      if(m_engineConfig->displaySettings.ghost)
+        ghostManager.askGhostSave(*m_presenter, world);
+      return {LevelLoopResult::NextLevel, std::nullopt};
     }
 
-    throttler.wait();
-    if(!m_presenter->preFrame())
+    if(!m_presenter->beginFrame())
     {
       continue;
     }
 
-    if(menu != nullptr)
-    {
-      {
-        const auto portals = world.getCameraController().update();
-        if(const auto lara = world.getObjectManager().getLaraPtr())
-          lara->m_state.location.room->node->setVisible(true);
-        m_presenter->renderWorld(world.getRooms(), world.getCameraController(), portals, world);
-      }
-      m_presenter->updateSoundEngine();
-      m_presenter->renderScreenOverlay();
-      ui::Ui ui{m_presenter->getMaterialManager()->getUi(),
-                world.getWorldGeometry().getPalette(),
-                m_presenter->getUiViewport()};
-      ui.drawBox({0, 0}, ui.getSize(), gl::SRGBA8{0, 0, 0, ui::DefaultBackgroundAlpha});
-      m_presenter->renderUi(ui, 1);
-      menu->renderObjects(ui, world);
-      menu->update(ui, world);
-      if(m_presenter->renderSettingsChanged())
-      {
-        ui.reset();
-        continue;
-      }
-
-      m_presenter->withBackbuffer(
-        [&menu, &world]()
-        {
-          const render::scene::RenderContext context{
-            render::material::RenderMode::FullOpaque, std::nullopt, render::scene::Translucency::Opaque};
-          menu->renderRenderedObjects(world);
-        });
-
-      m_presenter->renderUi(ui, 1);
-      m_presenter->swapBuffers();
-      switch(menu->result)
-      {
-      case menu::MenuResult::None:
-        break;
-      case menu::MenuResult::Closed:
-        menu.reset();
-        throttler.reset();
-        break;
-      case menu::MenuResult::ExitToTitle:
-        if(allowSave)
-        {
-          if(m_engineConfig->displaySettings.ghost && !ghostManager.askGhostSave(*m_presenter, world))
-            return {RunResult::ExitGame, std::nullopt};
-        }
-        m_gameplayRules = {};
-        return {RunResult::TitleLevel, std::nullopt};
-      case menu::MenuResult::ExitGame:
-        if(allowSave)
-        {
-          if(m_engineConfig->displaySettings.ghost && !ghostManager.askGhostSave(*m_presenter, world))
-            return {RunResult::ExitGame, std::nullopt};
-        }
-        return {RunResult::ExitGame, std::nullopt};
-      case menu::MenuResult::NewGame:
-        if(allowSave)
-        {
-          if(m_engineConfig->displaySettings.ghost && !ghostManager.askGhostSave(*m_presenter, world))
-            return {RunResult::ExitGame, std::nullopt};
-        }
-        return {RunResult::NextLevel, std::nullopt};
-      case menu::MenuResult::RestartLevel:
-        return {RunResult::RestartLevel, std::nullopt};
-      case menu::MenuResult::LaraHome:
-        return {RunResult::LaraHomeLevel, std::nullopt};
-      case menu::MenuResult::RequestLoad:
-        if(getSavegameMeta(menu->requestLoad).has_value())
-        {
-          if(allowSave)
-          {
-            if(m_engineConfig->displaySettings.ghost && !ghostManager.askGhostSave(*m_presenter, world))
-              return {RunResult::ExitGame, std::nullopt};
-          }
-          return {RunResult::RequestLoad, menu->requestLoad};
-        }
-        break;
-      case menu::MenuResult::RequestLevel:
-        return {RunResult::RequestLevel, menu->requestLevelSequenceIndex};
-      }
-
-      if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Load))
-      {
-        if(m_gameplayRules.noLoads)
-        {
-          if(auto lara = world.getObjectManager().getLaraPtr(); lara != nullptr)
-          {
-            lara->playSoundEffect(TR1SoundEffect::LaraNo);
-          }
-        }
-        else if(getSavegameMeta(std::nullopt).has_value())
-        {
-          return {RunResult::RequestLoad, std::nullopt};
-        }
-      }
-      continue;
-    }
+    m_presenter->updateSoundEngine();
+    m_throttler.tick();
 
-    if(isCutscene)
+    if(m_throttler.isTimeForLogic())
     {
-      if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Menu) || !world.cinematicLoop())
-        return {RunResult::NextLevel, std::nullopt};
+      gameLoop.tickGameLogic(world);
     }
-    else
+
+    if(m_throttler.isTimeForLogic() && gameLoop.menu == nullptr)
     {
       if(world.getObjectManager().getLara().isDead())
       {
-        world.getAudioEngine().setMusicGain(0);
-        laraDeadTime += 1_frame;
-        if(laraDeadTime >= core::FrameRate * 10_sec
-           || (laraDeadTime >= core::FrameRate * 2_sec && m_presenter->getInputHandler().hasAnyAction()))
-        {
-          menu = std::make_shared<menu::MenuDisplay>(menu::InventoryMode::DeathMode,
-                                                     menu::SaveGamePageMode::Restart,
-                                                     false,
-                                                     world,
-                                                     m_presenter->getRenderViewport());
-          throttler.reset();
+        if(gameLoop.handleLaraDead(*m_presenter, world))
           continue;
-        }
       }
 
       if(world.getCameraController().getMode() != CameraMode::Cinematic
          && m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Menu))
       {
-        menu
+        gameLoop.menu
           = std::make_shared<menu::MenuDisplay>(menu::InventoryMode::GameMode,
                                                 allowSave ? menu::SaveGamePageMode::Save : menu::SaveGamePageMode::Skip,
                                                 true,
                                                 world,
                                                 m_presenter->getRenderViewport());
-        throttler.reset();
+        m_presenter->getInputHandler().update();
+        m_throttler.reset();
         continue;
       }
 
       if(allowSave && m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Save))
       {
         world.save(std::nullopt);
-        throttler.reset();
+        m_throttler.reset();
       }
       else if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Load))
       {
@@ -633,44 +455,21 @@ std::pair<RunResult, std::optional<size_t>> Engine::run(world::World& world, boo
         }
         else if(getSavegameMeta(std::nullopt).has_value())
         {
-          return {RunResult::RequestLoad, std::nullopt};
+          return {LevelLoopResult::RequestLoad, std::nullopt};
         }
       }
 
       if(allAmmoCheat)
         world.getPlayer().getInventory().fillAllAmmo();
 
-      float blackAlpha = 0;
-      if(runtime < BlendInDuration)
-      {
-        runtime += 1_frame;
-        blackAlpha = 1 - runtime.cast<float>() / BlendInDuration.cast<float>();
-      }
-
-      ui::Ui ui{m_presenter->getMaterialManager()->getUi(),
-                world.getWorldGeometry().getPalette(),
-                m_presenter->getUiViewport()};
-
-      drawAmmoWidget(ui, getPresenter().getTrFont(), world, ammoDisplayDuration);
-      if(bugReportSavedDuration != 0_frame)
-      {
-        drawBugReportMessage(ui, getPresenter().getTrFont());
-        bugReportSavedDuration -= 1_frame;
-      }
-
-      if(allowSave && m_engineConfig->saveReminderEnabled && std::chrono::steady_clock::now() >= m_saveReminderSince)
-      {
-        drawSaveReminder(ui, getPresenter().getTrFont());
-      }
-
       if(ghostManager.getReader() != nullptr)
       {
         ghostManager.getModel()->apply(world, ghostManager.getReader()->read());
-        updateGhostRoom(world.getRooms(), gsl::not_null{ghostManager.getModel()});
+        updateGhostRoom(world.getRooms(), gsl_lite::not_null{ghostManager.getModel()});
       }
 
       world.getPlayer().timeSpent += 1_frame;
-      world.gameLoop(godMode, blackAlpha, ui);
+      world.updateGameLogic(godMode);
 
       const auto frame = world.getObjectManager().getLara().getGhostFrame();
 
@@ -684,82 +483,116 @@ std::pair<RunResult, std::optional<size_t>> Engine::run(world::World& world, boo
       world.nextGhostFrame();
     }
 
-    if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Screenshot))
+    if(gameLoop.menu != nullptr)
     {
-      makeScreenshot(*m_presenter, m_userDataPath);
-      throttler.reset();
-    }
+      if(const auto lara = world.getObjectManager().getLaraPtr(); lara != nullptr)
+        lara->m_state.location.room->node->setVisible(true);
 
-    if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::BugReport))
-    {
-      takeBugReport(world);
-      bugReportSavedDuration = core::FrameRate * 5_sec;
-      throttler.reset();
+      if(m_presenter->renderSettingsChanged())
+      {
+        continue;
+      }
+
+      if(const auto gameLoopResult = gameLoop.getMenuResultAsGameLoopResult(world,
+                                                                            ghostManager,
+                                                                            m_engineConfig->displaySettings.ghost,
+                                                                            m_gameplayRules.noLoads,
+                                                                            [this](const auto& slot)
+                                                                            {
+                                                                              return getSavegameMeta(slot);
+                                                                            });
+         gameLoopResult.has_value())
+      {
+        return *gameLoopResult;
+      }
     }
+
+    gameLoop.render(world,
+                    false,
+                    m_throttler.getInterTickFactor(),
+                    allowSave && m_engineConfig->saveReminderEnabled ? std::optional{m_saveReminderNext}
+                                                                     : std::nullopt);
   }
 }
 
-void Engine::takeBugReport(world::World& world)
+std::pair<LevelLoopResult, std::optional<size_t>> Engine::runCutscene(world::World& world)
 {
-  if(!std::filesystem::is_directory(m_userDataPath / "bugreports"))
-  {
-    std::filesystem::create_directory(m_userDataPath / "bugreports");
-  }
+  applySettings();
+  world.getCameraController().setMode(CameraMode::Cinematic);
 
-  const auto dirName = util::getCurrentHumanReadableTimestamp();
-  if(!std::filesystem::is_directory(m_userDataPath / "bugreports" / dirName))
-  {
-    std::filesystem::create_directory(m_userDataPath / "bugreports" / dirName);
-  }
+  LevelLoop gameLoop{gsl_lite::not_null{m_presenter}, m_userDataPath};
 
-  for(std::filesystem::directory_iterator it{m_userDataPath}; it != std::filesystem::directory_iterator{}; ++it)
+  m_throttler.reset();
+  while(true)
   {
-    BOOST_LOG_TRIVIAL(info) << it->path() << "; " << it->path().filename().string();
-    if(!it->is_regular_file() || !boost::algorithm::starts_with(it->path().filename().string(), "croftengine.")
-       || !boost::algorithm::ends_with(it->path().filename().string(), ".log"))
+    if(m_presenter->shouldClose())
+    {
+      return {LevelLoopResult::ExitGame, std::nullopt};
+    }
+
+    if(world.levelFinished())
+    {
+      return {LevelLoopResult::NextLevel, std::nullopt};
+    }
+
+    if(!m_presenter->beginFrame())
+    {
       continue;
+    }
 
-    std::filesystem::copy_file(it->path(), m_userDataPath / "bugreports" / dirName / it->path().filename());
-  }
+    m_presenter->updateSoundEngine();
+    m_throttler.tick();
 
-  auto img = m_presenter->takeScreenshot();
-  img.savePng(m_userDataPath / "bugreports" / dirName / "screenshot.png", false);
+    if(m_throttler.isTimeForLogic())
+    {
+      if(!gameLoop.tickCinematicLogic(world) || m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Menu))
+        return {LevelLoopResult::NextLevel, std::nullopt};
+    }
 
-  world.save(m_userDataPath / "bugreports" / dirName / "save.yaml");
+    gameLoop.render(world, true, m_throttler.getInterTickFactor(), std::nullopt);
+  }
 }
 
-std::pair<RunResult, std::optional<size_t>> Engine::runTitleMenu(world::World& world)
+std::pair<LevelLoopResult, std::optional<size_t>> Engine::runTitleMenu(world::World& world)
 {
   applySettings();
 
-  for(const auto& [slot, slotStream] : world.getAudioEngine().getSoundEngine().getSlots())
+  for(const auto& slotStream : world.getAudioEngine().getSoundEngine().getSlots() | std::views::values)
   {
     if(const auto stream = slotStream.stream.lock())
       stream->setLooping(true);
   }
 
-  const auto backdrop = gsl::make_shared<gl::TextureHandle<gl::Texture2D<gl::PremultipliedSRGBA8>>>(
+  const auto backdrop = gsl_lite::make_shared<gl::TextureHandle<gl::Texture2D<gl::PremultipliedSRGBA8>>>(
     gl::CImgWrapper{util::ensureFileExists(
                       getAssetDataPath() / std::filesystem::path{m_scriptEngine.getGameflow().getTitleMenuBackdrop()})}
       .toTexture("title"),
-    gsl::make_unique<gl::Sampler>("title" + gl::SamplerSuffix));
+    gsl_lite::make_unique<gl::Sampler>("title" + gl::SamplerSuffix));
   const auto menu = std::make_shared<menu::MenuDisplay>(
     menu::InventoryMode::TitleMode, menu::SaveGamePageMode::NewGame, false, world, m_presenter->getRenderViewport());
-  Throttler throttler;
+  m_throttler.reset();
   while(true)
   {
     if(m_presenter->shouldClose())
     {
-      return {RunResult::ExitGame, std::nullopt};
+      return {LevelLoopResult::ExitGame, std::nullopt};
     }
 
-    throttler.wait();
-
-    if(!m_presenter->preFrame())
+    if(!m_presenter->beginFrame())
+    {
       continue;
+    }
+
+    m_presenter->updateSoundEngine();
+    m_throttler.tick();
+    if(m_throttler.isTimeForLogic())
+    {
+      m_presenter->getInputHandler().update();
+    }
 
-    ui::Ui ui{
-      m_presenter->getMaterialManager()->getUi(), world.getWorldGeometry().getPalette(), m_presenter->getUiViewport()};
+    ui::Ui ui{m_presenter->getRenderSystem().getMaterialManager().getUi(),
+              world.getWorldGeometry().getPalette(),
+              m_presenter->getUiViewport()};
 
     std::shared_ptr<render::scene::Mesh> backdropMesh;
     {
@@ -769,11 +602,12 @@ std::pair<RunResult, std::optional<size_t>> Engine::runTitleMenu(world::World& w
 
       auto scaledSourceSize = sourceSize * splashScale;
       auto sourceOffset = (viewport - scaledSourceSize) / 2.0f;
-      backdropMesh = render::scene::createScreenQuad(sourceOffset,
-                                                     scaledSourceSize,
-                                                     m_presenter->getMaterialManager()->getBackdrop(false),
-                                                     render::scene::Translucency::Opaque,
-                                                     "backdrop");
+      backdropMesh
+        = render::scene::createScreenQuad(sourceOffset,
+                                          scaledSourceSize,
+                                          m_presenter->getRenderSystem().getMaterialManager().getBackdrop(false),
+                                          render::scene::Translucency::Opaque,
+                                          "backdrop");
       backdropMesh->bind(
         "u_input",
         [backdrop](const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
@@ -789,16 +623,21 @@ std::pair<RunResult, std::optional<size_t>> Engine::runTitleMenu(world::World& w
         uniform.set(backdrop);
       });
 
-    menu->renderObjects(ui, world);
-    menu->update(ui, world);
-    m_presenter->withBackbuffer(
-      [&backdropMesh, &menu, &world]()
+    if(m_throttler.isTimeForLogic())
+    {
+      menu->tick(world);
+    }
+
+    menu->renderObjectsToFramebuffer(world);
+    menu->constructUi(ui, world);
+    m_presenter->inBackbuffer(
+      [&backdropMesh, &menu, &world]
       {
         {
           render::scene::RenderContext context{
             render::material::RenderMode::FullOpaque, std::nullopt, render::scene::Translucency::Opaque};
           backdropMesh->render(nullptr, context);
-          menu->renderRenderedObjects(world);
+          menu->renderFramebuffer(world);
         }
       });
     if(m_presenter->renderSettingsChanged())
@@ -806,58 +645,59 @@ std::pair<RunResult, std::optional<size_t>> Engine::runTitleMenu(world::World& w
       continue;
     }
 
-    m_presenter->renderUi(ui, 1);
-    m_presenter->updateSoundEngine();
+    m_presenter->renderUiToBackbuffer(ui, 1);
     m_presenter->swapBuffers();
+
+    if(!m_throttler.isTimeForLogic())
+    {
+      continue;
+    }
+
     switch(menu->result)
     {
     case menu::MenuResult::None:
       break;
     case menu::MenuResult::Closed:
-      return {RunResult::ExitGame, std::nullopt};
+      return {LevelLoopResult::ExitGame, std::nullopt};
     case menu::MenuResult::ExitToTitle:
-      return {RunResult::TitleLevel, std::nullopt};
+      return {LevelLoopResult::TitleLevel, std::nullopt};
     case menu::MenuResult::ExitGame:
-      return {RunResult::ExitGame, std::nullopt};
+      return {LevelLoopResult::ExitGame, std::nullopt};
     case menu::MenuResult::NewGame:
-      return {RunResult::NextLevel, std::nullopt};
+      return {LevelLoopResult::NextLevel, std::nullopt};
     case menu::MenuResult::LaraHome:
-      return {RunResult::LaraHomeLevel, std::nullopt};
+      return {LevelLoopResult::LaraHomeLevel, std::nullopt};
     case menu::MenuResult::RestartLevel:
-      return {RunResult::RestartLevel, std::nullopt};
+      return {LevelLoopResult::RestartLevel, std::nullopt};
     case menu::MenuResult::RequestLoad:
       if(getSavegameMeta(menu->requestLoad).has_value())
       {
-        return {RunResult::RequestLoad, menu->requestLoad};
+        return {LevelLoopResult::RequestLoad, menu->requestLoad};
       }
       break;
     case menu::MenuResult::RequestLevel:
-      return {RunResult::RequestLevel, menu->requestLevelSequenceIndex};
+      return {LevelLoopResult::RequestLevel, menu->requestLevelSequenceIndex};
     }
 
-    if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Screenshot))
-    {
-      makeScreenshot(*m_presenter, m_userDataPath);
-    }
-    else if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Load))
+    if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Load))
     {
       if(getSavegameMeta(std::nullopt).has_value())
-        return {RunResult::RequestLoad, std::nullopt};
+        return {LevelLoopResult::RequestLoad, std::nullopt};
     }
-  } // namespace engine
+  }
 }
 
-std::pair<RunResult, std::optional<size_t>>
+std::pair<LevelLoopResult, std::optional<size_t>>
   Engine::runLevelSequenceItem(script::LevelSequenceItem& item,
                                const std::shared_ptr<Player>& player,
                                const std::shared_ptr<Player>& levelStartPlayer)
 {
   m_presenter->clear();
   applySettings();
-  return item.run(gsl::not_null{this}, player, levelStartPlayer);
+  return item.run(gsl_lite::not_null{this}, player, levelStartPlayer);
 }
 
-std::pair<RunResult, std::optional<size_t>>
+std::pair<LevelLoopResult, std::optional<size_t>>
   Engine::runLevelSequenceItemFromSave(script::LevelSequenceItem& item,
                                        const std::optional<size_t>& slot,
                                        const std::shared_ptr<Player>& player,
@@ -865,7 +705,7 @@ std::pair<RunResult, std::optional<size_t>>
 {
   m_presenter->clear();
   applySettings();
-  return item.runFromSave(gsl::not_null{this}, slot, player, levelStartPlayer);
+  return item.runFromSave(gsl_lite::not_null{this}, slot, player, levelStartPlayer);
 }
 
 std::unique_ptr<loader::trx::Glidos> Engine::loadGlidosPack() const
@@ -883,8 +723,8 @@ std::unique_ptr<loader::trx::Glidos> Engine::loadGlidosPack() const
   return std::make_unique<loader::trx::Glidos>(m_engineConfig->renderSettings.glidosPack.value(),
                                                [this, &lastUpdate](const std::string& s)
                                                {
-                                                 const auto now = std::chrono::high_resolution_clock::now();
-                                                 if(lastUpdate + core::TimePerFrame < now)
+                                                 if(const auto now = std::chrono::high_resolution_clock::now();
+                                                    lastUpdate + core::TimePerFrame < now)
                                                  {
                                                    lastUpdate = now;
                                                    m_presenter->drawLoadingScreen(s);
@@ -900,7 +740,7 @@ std::optional<SavegameMeta> Engine::getSavegameMeta(const std::filesystem::path&
 
   serialization::YAMLDocument<true> doc{filepath};
   SavegameMeta meta{};
-  doc.deserialize("meta", gsl::not_null{&meta}, meta);
+  doc.deserialize("meta", gsl_lite::not_null{&meta}, meta);
   return meta;
 }
 
@@ -920,7 +760,7 @@ void Engine::applySettings()
     {
       room.collectShaderLights(m_engineConfig->renderSettings.getLightCollectionDepth());
       room.regenerateDust(*m_presenter,
-                          m_presenter->getMaterialManager()->getDustParticle(),
+                          m_presenter->getRenderSystem().getMaterialManager().getDustParticle(),
                           m_engineConfig->renderSettings.dustActive,
                           m_engineConfig->renderSettings.dustDensity);
     }
@@ -950,7 +790,7 @@ std::filesystem::path Engine::getAssetDataPath() const
 
 void Engine::onGameSavedOrLoaded()
 {
-  m_saveReminderSince = std::chrono::steady_clock::now() + std::chrono::minutes{m_engineConfig->saveReminderMinutes};
+  m_saveReminderNext = std::chrono::steady_clock::now() + std::chrono::minutes{m_engineConfig->saveReminderMinutes};
 }
 
 void SavegameMeta::serialize(const serialization::Serializer<SavegameMeta>& ser) const
@@ -962,4 +802,4 @@ void SavegameMeta::deserialize(const serialization::Deserializer<SavegameMeta>&
 {
   ser(S_NV("filename", filename));
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 6d9128192..3a2c5a594 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -3,6 +3,7 @@
 #include "gameplayrules.h"
 #include "script/scriptengine.h"
 #include "serialization/serialization_fwd.h"
+#include "throttler.h"
 #include "world/worldgeometry.h"
 
 #include <boost/assert.hpp>
@@ -11,7 +12,7 @@
 #include <cstdint>
 #include <filesystem>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -39,17 +40,7 @@ namespace engine
 class Player;
 class Presenter;
 struct EngineConfig;
-
-enum class RunResult : uint8_t
-{
-  NextLevel,
-  TitleLevel,
-  LaraHomeLevel,
-  ExitGame,
-  RequestLoad,
-  RequestLevel,
-  RestartLevel
-};
+enum class LevelLoopResult : uint8_t;
 
 struct SavegameMeta
 {
@@ -65,7 +56,7 @@ struct SavegameInfo
   std::filesystem::file_time_type saveTime;
 };
 
-inline std::string makeSavegameFilename(size_t n)
+inline std::string makeSavegameFilename(const size_t n)
 {
   return "save_" + std::to_string(n) + ".yaml";
 }
@@ -101,8 +92,9 @@ class Engine
     return *m_presenter;
   }
 
-  std::pair<RunResult, std::optional<size_t>> run(world::World& world, bool isCutscene, bool allowSave);
-  std::pair<RunResult, std::optional<size_t>> runTitleMenu(world::World& world);
+  std::pair<LevelLoopResult, std::optional<size_t>> runLevel(world::World& world, bool allowSave);
+  std::pair<LevelLoopResult, std::optional<size_t>> runCutscene(world::World& world);
+  std::pair<LevelLoopResult, std::optional<size_t>> runTitleMenu(world::World& world);
 
   [[nodiscard]] const std::string& getLocale() const noexcept
   {
@@ -125,10 +117,11 @@ class Engine
     return m_engineDataPath;
   }
 
-  std::pair<RunResult, std::optional<size_t>> runLevelSequenceItem(script::LevelSequenceItem& item,
-                                                                   const std::shared_ptr<Player>& player,
-                                                                   const std::shared_ptr<Player>& levelStartPlayer);
-  std::pair<RunResult, std::optional<size_t>>
+  std::pair<LevelLoopResult, std::optional<size_t>>
+    runLevelSequenceItem(script::LevelSequenceItem& item,
+                         const std::shared_ptr<Player>& player,
+                         const std::shared_ptr<Player>& levelStartPlayer);
+  std::pair<LevelLoopResult, std::optional<size_t>>
     runLevelSequenceItemFromSave(script::LevelSequenceItem& item,
                                  const std::optional<size_t>& slot,
                                  const std::shared_ptr<Player>& player,
@@ -157,7 +150,7 @@ class Engine
     m_worlds.emplace(world);
   }
 
-  void unregisterWorld(const gsl::not_null<world::World*>& world)
+  void unregisterWorld(const gsl_lite::not_null<world::World*>& world)
   {
     m_worlds.erase(world);
   }
@@ -204,17 +197,30 @@ class Engine
     m_gameplayRules = rules;
   }
 
-private:
-  void takeBugReport(world::World& world);
+  const auto& getThrottler() const noexcept
+  {
+    return m_throttler;
+  }
+
+  auto& getThrottler() noexcept
+  {
+    return m_throttler;
+  }
 
+  void resetGameplayRules()
+  {
+    m_gameplayRules = {};
+  }
+
+private:
   std::filesystem::path m_userDataPath;
   std::filesystem::path m_engineDataPath;
   std::string m_gameflowId;
   script::ScriptEngine m_scriptEngine;
   gslu::nn_shared<EngineConfig> m_engineConfig;
   std::shared_ptr<Presenter> m_presenter;
-  std::set<gsl::not_null<world::World*>> m_worlds;
-  std::chrono::steady_clock::time_point m_saveReminderSince;
+  std::set<gsl_lite::not_null<world::World*>> m_worlds;
+  std::chrono::steady_clock::time_point m_saveReminderNext;
   GameplayRules m_gameplayRules{};
 
   std::string m_locale;
@@ -223,5 +229,7 @@ class Engine
   [[nodiscard]] std::unique_ptr<loader::trx::Glidos> loadGlidosPack() const;
 
   std::pair<std::filesystem::path, std::shared_ptr<world::WorldGeometry>> m_worldGeometryCache;
+
+  Throttler m_throttler;
 };
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/engineconfig.cpp b/src/engine/engineconfig.cpp
index a84ec2c63..a78b3b94b 100644
--- a/src/engine/engineconfig.cpp
+++ b/src/engine/engineconfig.cpp
@@ -255,7 +255,7 @@ EngineConfig::EngineConfig()
 {
 }
 
-void EngineConfig::resetInputMappings(bool modern)
+void EngineConfig::resetInputMappings(const bool modern)
 {
   inputMappings = modern ? getDefaultModernMappings() : getDefaultClassicMappings();
 }
diff --git a/src/engine/floordata/floordata.cpp b/src/engine/floordata/floordata.cpp
index 51c213fce..b74ada460 100644
--- a/src/engine/floordata/floordata.cpp
+++ b/src/engine/floordata/floordata.cpp
@@ -6,7 +6,7 @@
 #include "util/helpers.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <optional>
 
 namespace engine::floordata
@@ -36,7 +36,7 @@ ActivationState ActivationState::create(const serialization::Deserializer<world:
 
 ActivationState::ActivationSet ActivationState::extractActivationSet(const FloorDataValue& fd)
 {
-  const auto bits = gsl::narrow_cast<uint16_t>(util::bits(fd.get(), 9, 5));
+  const auto bits = gsl_lite::narrow_cast<uint16_t>(util::bits(fd.get(), 9, 5));
   return ActivationSet{bits};
 }
 
@@ -62,22 +62,22 @@ std::optional<uint8_t> getBoundaryRoom(const FloorDataValue* fdData)
   }
   if(chunk.type == FloorDataChunkType::BoundaryRoom)
   {
-    return gsl::narrow_cast<uint8_t>(fdData[1].get());
+    return gsl_lite::narrow_cast<uint8_t>(fdData[1].get());
   }
 
   return {};
 }
 
 CameraParameters::CameraParameters(const FloorDataValue& fd)
-    : timeout{core::Seconds{static_cast<core::Seconds::type>(int8_t(fd.get()))}}
+    : timeout{core::Seconds{static_cast<core::Seconds::type>(static_cast<int8_t>(fd.get()))}}
     , oneshot{(fd.get() & 0x100u) != 0}
     , isLast{(fd.get() & 0x8000u) != 0}
-    , smoothness{gsl::narrow_cast<uint8_t>(util::bits(fd.get(), 9, 5) * 2)}
+    , smoothness{gsl_lite::narrow_cast<uint8_t>(util::bits(fd.get(), 9, 5) * 2)}
 {
 }
 
 CommandOpcode Command::extractOpcode(const FloorDataValue& data)
 {
-  return gsl::narrow_cast<CommandOpcode>(util::bits(data.get(), 10, 4));
+  return gsl_lite::narrow_cast<CommandOpcode>(util::bits(data.get(), 10, 4));
 }
-} // namespace engine::floordata
+} // namespace engine::floordata
\ No newline at end of file
diff --git a/src/engine/floordata/floordata.h b/src/engine/floordata/floordata.h
index cc33dee10..fb127f5a2 100644
--- a/src/engine/floordata/floordata.h
+++ b/src/engine/floordata/floordata.h
@@ -9,7 +9,7 @@
 #include <bitset>
 #include <cstddef>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <optional>
 
 namespace engine::world
@@ -34,13 +34,13 @@ struct FloorDataChunk
 
   static FloorDataChunkType extractType(const FloorDataValue& data) noexcept
   {
-    return gsl::narrow_cast<FloorDataChunkType>(data.get() & 0xffu);
+    return gsl_lite::narrow_cast<FloorDataChunkType>(data.get() & 0xffu);
   }
 
 private:
   static SequenceCondition extractSequenceCondition(const FloorDataValue& data) noexcept
   {
-    return gsl::narrow_cast<SequenceCondition>((data.get() & 0x3f00u) >> 8u);
+    return gsl_lite::narrow_cast<SequenceCondition>((data.get() & 0x3f00u) >> 8u);
   }
 
   static constexpr bool extractIsLast(const FloorDataValue& data)
@@ -67,8 +67,8 @@ class ActivationState
       , m_locked{(fd.get() & Locked) != 0}
       , m_activationSet{extractActivationSet(fd)}
   {
-    const auto timeout = core::Seconds{gsl::narrow_cast<core::Seconds::type>(fd.get() & TimeoutMask)};
-    if(timeout.get() == 1)
+    if(const auto timeout = core::Seconds{gsl_lite::narrow_cast<core::Seconds::type>(fd.get() & TimeoutMask)};
+       timeout.get() == 1)
       m_timeout = 1_frame;
     else
       m_timeout = timeout * core::FrameRate;
@@ -192,7 +192,7 @@ struct Command
 
   static constexpr uint16_t extractParameter(const FloorDataValue& data)
   {
-    return gsl::narrow_cast<uint16_t>(data.get() & 0x03ffu);
+    return gsl_lite::narrow_cast<uint16_t>(data.get() & 0x03ffu);
   }
 
   static constexpr bool extractIsLast(const FloorDataValue& data)
@@ -202,4 +202,4 @@ struct Command
 };
 
 extern std::optional<uint8_t> getBoundaryRoom(const FloorDataValue* fdData);
-} // namespace engine::floordata
+} // namespace engine::floordata
\ No newline at end of file
diff --git a/src/engine/floordata/secrets.cpp b/src/engine/floordata/secrets.cpp
index 2215c73e1..6f1747a8b 100644
--- a/src/engine/floordata/secrets.cpp
+++ b/src/engine/floordata/secrets.cpp
@@ -10,7 +10,6 @@
 
 namespace engine::floordata
 {
-
 std::bitset<16> getSecretsMask(const FloorDataValue* floorData)
 {
   if(floorData == nullptr)
diff --git a/src/engine/ghosting/ghost.cpp b/src/engine/ghosting/ghost.cpp
index 94743e2b1..c1c8448ad 100644
--- a/src/engine/ghosting/ghost.cpp
+++ b/src/engine/ghosting/ghost.cpp
@@ -9,7 +9,7 @@
 #include <filesystem>
 #include <fstream>
 #include <glm/mat4x4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iosfwd>
 #include <istream>
 #include <memory>
@@ -38,7 +38,7 @@ void writeMatrix(std::ostream& s, const glm::mat4& m)
       {
         BOOST_ASSERT(m[x][y] >= -1.0f);
         BOOST_ASSERT(m[x][y] <= 1.0f);
-        auto scaled = gsl::narrow_cast<int16_t>(m[x][y] * MatrixRotationScale);
+        auto scaled = gsl_lite::narrow_cast<int16_t>(m[x][y] * MatrixRotationScale);
         // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
         s.write(reinterpret_cast<const char*>(&scaled), sizeof(scaled));
       }
@@ -78,7 +78,7 @@ void writeMatrix(std::ostream& s, const glm::mat4& m)
 
 void GhostFrame::write(std::ostream& s) const
 {
-  const auto size = gsl::narrow<uint8_t>(bones.size());
+  const auto size = gsl_lite::narrow<uint8_t>(bones.size());
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
   s.write(reinterpret_cast<const char*>(&size), sizeof(size));
   for(const auto& bone : bones)
@@ -116,6 +116,7 @@ GhostDataWriter::GhostDataWriter(const std::filesystem::path& path)
 
 GhostDataWriter::~GhostDataWriter() = default;
 
+// ReSharper disable once CppMemberFunctionMayBeConst
 void GhostDataWriter::append(const GhostFrame& frame)
 {
   frame.write(*m_file);
@@ -135,6 +136,7 @@ GhostDataReader::GhostDataReader(const std::filesystem::path& path)
 
 GhostDataReader::~GhostDataReader() = default;
 
+// ReSharper disable once CppMemberFunctionMayBeConst
 GhostFrame GhostDataReader::read()
 {
   GhostFrame result;
@@ -177,4 +179,4 @@ void GhostMeta::deserialize(const serialization::Deserializer<GhostMeta>& ser)
 {
   ser(S_NV("duration", duration), S_NV("finishState", finishState), S_NV("level", level), S_NV("gameflow", gameflow));
 }
-} // namespace engine::ghosting
+} // namespace engine::ghosting
\ No newline at end of file
diff --git a/src/engine/ghosting/ghostmodel.cpp b/src/engine/ghosting/ghostmodel.cpp
index aff406eb1..3cecebc88 100644
--- a/src/engine/ghosting/ghostmodel.cpp
+++ b/src/engine/ghosting/ghostmodel.cpp
@@ -16,19 +16,19 @@
 #include <gl/pixel.h>
 #include <gl/renderstate.h>
 #include <glm/mat4x4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <vector>
 
 namespace engine::ghosting
 {
-void GhostModel::apply(const world::World& world, const GhostFrame& frame)
+void GhostModel::apply(world::World& world, const GhostFrame& frame)
 {
   setLocalMatrix(frame.modelMatrix);
   m_roomId = frame.roomId;
 
-  engine::world::RenderMeshDataCompositor compositor;
+  world::RenderMeshDataCompositor compositor;
   std::vector<glm::mat4> matrices;
   matrices.reserve(frame.bones.size());
   for(const auto& bone : frame.bones)
@@ -46,22 +46,22 @@ void GhostModel::apply(const world::World& world, const GhostFrame& frame)
   }
   else
   {
-    auto mesh = compositor.toMesh(
-      *world.getPresenter().getMaterialManager(),
+    const auto mesh = compositor.toMesh(
+      world.getEngine().getPresenter().getRenderSystem().getMaterialManager(),
       true,
       false,
-      [&engine = world.getEngine()]()
+      [&engine = world.getEngine()]
       {
         return engine.getEngineConfig()->animSmoothing;
       },
-      [&engine = world.getEngine()]()
+      [&engine = world.getEngine()]
       {
         const auto& settings = engine.getEngineConfig()->renderSettings;
         return !settings.lightingModeActive ? 0 : settings.lightingMode;
       },
       getName());
-    const auto m = world.getPresenter().getMaterialManager()->getGhost(
-      [&engine = world.getEngine()]()
+    const auto m = world.getEngine().getPresenter().getRenderSystem().getMaterialManager().getGhost(
+      [&engine = world.getEngine()]
       {
         return engine.getEngineConfig()->animSmoothing;
       });
@@ -82,4 +82,4 @@ void GhostModel::apply(const world::World& world, const GhostFrame& frame)
     m_meshMatricesBuffer->setSubData(matrices, 0);
   }
 }
-} // namespace engine::ghosting
+} // namespace engine::ghosting
\ No newline at end of file
diff --git a/src/engine/ghosting/ghostmodel.h b/src/engine/ghosting/ghostmodel.h
index 62f808eef..f6930181d 100644
--- a/src/engine/ghosting/ghostmodel.h
+++ b/src/engine/ghosting/ghostmodel.h
@@ -8,7 +8,7 @@
 #include <gl/program.h>
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -30,18 +30,18 @@ class GhostModel final : public render::scene::Node
 {
 public:
   GhostModel()
-      : render::scene::Node{"ghost"}
+      : Node{"ghost"}
   {
     setColor(gl::SRGB8{51, 51, 204});
   }
 
-  void apply(const engine::world::World& world, const GhostFrame& frame);
+  void apply(world::World& world, const GhostFrame& frame);
 
   [[nodiscard]] const auto& getMeshMatricesBuffer() const
   {
     if(m_meshMatricesBuffer == nullptr)
       m_meshMatricesBuffer = std::make_unique<gl::ShaderStorageBuffer<glm::mat4>>(
-        "mesh-matrices-ssb", gl::api::BufferUsage::DynamicDraw, gsl::span<glm::mat4>{});
+        "mesh-matrices-ssb", gl::api::BufferUsage::DynamicDraw, gsl_lite::span<glm::mat4>{});
     return *m_meshMatricesBuffer;
   }
 
@@ -53,8 +53,8 @@ class GhostModel final : public render::scene::Node
   void setColor(const gl::SRGB8& color)
   {
     bind("u_color",
-         [color = glm::vec3{color.channels}
-                  / 255.0f](const render::scene::Node*, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+         [color
+          = glm::vec3{color.channels} / 255.0f](const Node*, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
          {
            uniform.set(color);
          });
@@ -64,4 +64,4 @@ class GhostModel final : public render::scene::Node
   mutable std::unique_ptr<gl::ShaderStorageBuffer<glm::mat4>> m_meshMatricesBuffer;
   uint32_t m_roomId = 0;
 };
-} // namespace engine::ghosting
+} // namespace engine::ghosting
\ No newline at end of file
diff --git a/src/engine/ghostmanager.cpp b/src/engine/ghostmanager.cpp
index 682dd5443..d28851380 100644
--- a/src/engine/ghostmanager.cpp
+++ b/src/engine/ghostmanager.cpp
@@ -17,6 +17,7 @@
 #include "qs/quantity.h"
 #include "render/material/materialmanager.h"
 #include "render/scene/node.h"
+#include "render/scene/scenegraph.h"
 #include "serialization/serialization.h"
 #include "serialization/yamldocument.h"
 #include "throttler.h"
@@ -28,8 +29,9 @@
 
 #include <boost/log/trivial.hpp>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
+#include <ranges>
 #include <string>
 #include <system_error>
 
@@ -70,55 +72,74 @@ GhostManager::~GhostManager()
   std::filesystem::remove(m_writerPath, ec);
 }
 
-bool GhostManager::askGhostSave(Presenter& presenter, world::World& world)
+void GhostManager::askGhostSave(Presenter& presenter, world::World& world)
 {
   const auto msgBox = std::make_shared<ui::widgets::MessageBox>(
     /* translators: TR charmap encoding */ _("Save recorded ghost?"));
   msgBox->fitToContent();
   msgBox->setConfirmed(false);
 
-  Throttler throttler;
+  world.getEngine().getThrottler().reset();
   while(true)
   {
-    throttler.wait();
-
     if(presenter.shouldClose())
     {
-      return false;
+      return;
     }
 
-    if(!presenter.preFrame())
+    if(!presenter.beginFrame())
     {
       continue;
     }
 
-    if(presenter.getInputHandler().hasDebouncedAction(hid::Action::MenuLeft)
-       || presenter.getInputHandler().hasDebouncedAction(hid::Action::MenuRight))
+    world.getEngine().getThrottler().tick();
+
+    if(world.getEngine().getThrottler().isTimeForLogic())
     {
-      msgBox->toggleConfirmed();
+      presenter.getInputHandler().update();
+
+      if(presenter.getInputHandler().hasDebouncedAction(hid::Action::MenuLeft)
+         || presenter.getInputHandler().hasDebouncedAction(hid::Action::MenuRight))
+      {
+        msgBox->toggleConfirmed();
+      }
     }
 
-    ui::Ui ui{
-      presenter.getMaterialManager()->getUi(), world.getWorldGeometry().getPalette(), presenter.getUiViewport()};
+    ui::Ui ui{presenter.getRenderSystem().getMaterialManager().getUi(),
+              world.getWorldGeometry().getPalette(),
+              presenter.getUiViewport()};
 
     msgBox->setPosition({(ui.getSize().x - msgBox->getSize().x) / 2, (ui.getSize().y - msgBox->getSize().y) / 2});
-    msgBox->update(true);
+    if(world.getEngine().getThrottler().isTimeForLogic())
+    {
+      msgBox->tick(true);
+    }
     msgBox->draw(ui, presenter);
+    if(world.getEngine().getThrottler().isTimeForLogic())
+    {
+      world.getCameraController().updateGameLogic(true);
+    }
+    if(const auto lara = world.getObjectManager().getLaraPtr())
+      lara->m_state.location.room->node->setVisible(true);
+    presenter.renderWorldGeometryFramebuffers(
+      world.getRooms(), world.getCameraController(), world.getCameraController().traceWaterSurfacePortals(), world);
+    presenter.renderUiToBackbuffer(ui, 1.0f);
+    if(world.getEngine().getThrottler().isTimeForLogic())
     {
-      const auto portals = world.getCameraController().update();
-      if(const auto lara = world.getObjectManager().getLaraPtr())
-        lara->m_state.location.room->node->setVisible(true);
-      presenter.renderWorld(world.getRooms(), world.getCameraController(), portals, world);
+      presenter.updateSoundEngine();
     }
-    presenter.renderScreenOverlay();
-    presenter.renderUi(ui, 1.0f);
-    presenter.updateSoundEngine();
     presenter.swapBuffers();
+
+    if(!world.getEngine().getThrottler().isTimeForLogic())
+    {
+      continue;
+    }
+
     if(!presenter.getInputHandler().hasDebouncedAction(hid::Action::Action))
       continue;
 
     if(!msgBox->isConfirmed())
-      return true;
+      return;
 
     m_reader.reset();
     m_writer.reset();
@@ -147,7 +168,7 @@ bool GhostManager::askGhostSave(Presenter& presenter, world::World& world)
 
     const auto ymlFilepath = std::filesystem::path{m_readerPath}.replace_extension(".yml");
     serialization::YAMLDocument<false> metaDoc{ymlFilepath};
-    metaDoc.serialize("ghost", gsl::not_null{&ghostMeta}, ghostMeta);
+    metaDoc.serialize("ghost", gsl_lite::not_null{&ghostMeta}, ghostMeta);
     metaDoc.write();
 
     const auto tarXzFilepath = std::filesystem::path{m_readerPath}.replace_extension(".tar.xz");
@@ -162,13 +183,13 @@ bool GhostManager::askGhostSave(Presenter& presenter, world::World& world)
 
     addFile(m_readerPath);
     addFile(ymlFilepath);
-    return true;
+    return;
   }
 }
 
-void GhostManager::setChildrenVisibility(bool visible)
+void GhostManager::setChildrenVisibility(const bool visible)
 {
-  for(const auto& [peerId, model] : m_remoteModels)
+  for(const auto& model : m_remoteModels | std::views::values)
   {
     if(model == nullptr)
       continue;
@@ -179,4 +200,4 @@ void GhostManager::setChildrenVisibility(bool visible)
     }
   }
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/ghostmanager.h b/src/engine/ghostmanager.h
index c8fd61d5c..21d44e76a 100644
--- a/src/engine/ghostmanager.h
+++ b/src/engine/ghostmanager.h
@@ -28,7 +28,7 @@ class GhostManager final
 
   ~GhostManager();
 
-  bool askGhostSave(Presenter& presenter, world::World& world);
+  void askGhostSave(Presenter& presenter, world::World& world);
 
   [[nodiscard]] const auto& getModel() const noexcept
   {
diff --git a/src/engine/heightinfo.cpp b/src/engine/heightinfo.cpp
index baf50777d..691a1ebb1 100644
--- a/src/engine/heightinfo.cpp
+++ b/src/engine/heightinfo.cpp
@@ -12,7 +12,7 @@
 
 #include <cstdint>
 #include <cstdlib>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 #include <memory>
@@ -21,7 +21,7 @@ namespace engine
 {
 bool HeightInfo::skipSteepSlants = false;
 
-HeightInfo HeightInfo::fromFloor(gsl::not_null<const world::Sector*> roomSector,
+HeightInfo HeightInfo::fromFloor(gsl_lite::not_null<const world::Sector*> roomSector,
                                  const core::TRVec& pos,
                                  const std::map<uint16_t, gslu::nn_shared<objects::Object>>& objects)
 {
@@ -29,7 +29,7 @@ HeightInfo HeightInfo::fromFloor(gsl::not_null<const world::Sector*> roomSector,
 
   while(roomSector->roomBelow != nullptr)
   {
-    roomSector = gsl::not_null{roomSector->roomBelow->getSectorByAbsolutePosition(pos)};
+    roomSector = gsl_lite::not_null{roomSector->roomBelow->getSectorByAbsolutePosition(pos)};
   }
 
   hi.y = roomSector->floorHeight;
@@ -40,7 +40,7 @@ HeightInfo HeightInfo::fromFloor(gsl::not_null<const world::Sector*> roomSector,
   }
 
   // process additional slant and object height patches
-  const floordata::FloorDataValue* fd = gsl::not_null{roomSector->floorData}.get();
+  const floordata::FloorDataValue* fd = gsl_lite::not_null{roomSector->floorData}.get();
   while(true)
   {
     const floordata::FloorDataChunk chunkHeader{*fd++};
@@ -48,12 +48,11 @@ HeightInfo HeightInfo::fromFloor(gsl::not_null<const world::Sector*> roomSector,
     {
     case floordata::FloorDataChunkType::FloorSlant:
     {
-      const core::Length::type xSlant = gsl::narrow_cast<int8_t>(util::bits(fd->get(), 0, 8));
-      const core::Length::type zSlant = gsl::narrow_cast<int8_t>(util::bits(fd->get(), 8, 8));
+      const core::Length::type xSlant = gsl_lite::narrow_cast<int8_t>(util::bits(fd->get(), 0, 8));
+      const core::Length::type zSlant = gsl_lite::narrow_cast<int8_t>(util::bits(fd->get(), 8, 8));
       ++fd;
       const core::Length::type absX = std::abs(xSlant);
-      const core::Length::type absZ = std::abs(zSlant);
-      if(!skipSteepSlants || (absX <= 2 && absZ <= 2))
+      if(const core::Length::type absZ = std::abs(zSlant); !skipSteepSlants || (absX <= 2 && absZ <= 2))
       {
         if(absX <= 2 && absZ <= 2)
           hi.slantClass = SlantClass::Max512;
@@ -89,7 +88,7 @@ HeightInfo HeightInfo::fromFloor(gsl::not_null<const world::Sector*> roomSector,
       }
     }
     break;
-      // NOLINTNEXTLINE(bugprone-branch-clone)
+    // NOLINTNEXTLINE(bugprone-branch-clone)
     case floordata::FloorDataChunkType::CeilingSlant:
       ++fd;
       break;
@@ -133,7 +132,7 @@ HeightInfo HeightInfo::fromFloor(gsl::not_null<const world::Sector*> roomSector,
   return hi;
 }
 
-HeightInfo HeightInfo::fromCeiling(gsl::not_null<const world::Sector*> roomSector,
+HeightInfo HeightInfo::fromCeiling(gsl_lite::not_null<const world::Sector*> roomSector,
                                    const core::TRVec& pos,
                                    const std::map<uint16_t, gslu::nn_shared<objects::Object>>& objects)
 {
@@ -141,14 +140,14 @@ HeightInfo HeightInfo::fromCeiling(gsl::not_null<const world::Sector*> roomSecto
 
   while(roomSector->roomAbove != nullptr)
   {
-    roomSector = gsl::not_null{roomSector->roomAbove->getSectorByAbsolutePosition(pos)};
+    roomSector = gsl_lite::not_null{roomSector->roomAbove->getSectorByAbsolutePosition(pos)};
   }
 
   hi.y = roomSector->ceilingHeight;
 
   if(roomSector->floorData != nullptr)
   {
-    const floordata::FloorDataValue* fd = gsl::not_null{roomSector->floorData}.get();
+    const floordata::FloorDataValue* fd = gsl_lite::not_null{roomSector->floorData}.get();
     floordata::FloorDataChunk chunkHeader{*fd};
     ++fd;
 
@@ -162,11 +161,10 @@ HeightInfo HeightInfo::fromCeiling(gsl::not_null<const world::Sector*> roomSecto
 
     if(chunkHeader.type == floordata::FloorDataChunkType::CeilingSlant)
     {
-      const core::Length::type xSlant = gsl::narrow_cast<int8_t>(util::bits(fd->get(), 0, 8));
+      const core::Length::type xSlant = gsl_lite::narrow_cast<int8_t>(util::bits(fd->get(), 0, 8));
       const core::Length::type absX = std::abs(xSlant);
-      const core::Length::type zSlant = gsl::narrow_cast<int8_t>(util::bits(fd->get(), 8, 8));
-      const core::Length::type absZ = std::abs(zSlant);
-      if(!skipSteepSlants || (absX <= 2 && absZ <= 2))
+      const core::Length::type zSlant = gsl_lite::narrow_cast<int8_t>(util::bits(fd->get(), 8, 8));
+      if(const core::Length::type absZ = std::abs(zSlant); !skipSteepSlants || (absX <= 2 && absZ <= 2))
       {
         const auto localX = toSectorLocal(pos.X);
         const auto localZ = toSectorLocal(pos.Z);
@@ -200,7 +198,7 @@ HeightInfo HeightInfo::fromCeiling(gsl::not_null<const world::Sector*> roomSecto
 
   while(roomSector->roomBelow != nullptr)
   {
-    roomSector = gsl::not_null{roomSector->roomBelow->getSectorByAbsolutePosition(pos)};
+    roomSector = gsl_lite::not_null{roomSector->roomBelow->getSectorByAbsolutePosition(pos)};
   }
 
   if(roomSector->floorData == nullptr)
@@ -250,4 +248,4 @@ HeightInfo HeightInfo::fromCeiling(gsl::not_null<const world::Sector*> roomSecto
 
   return hi;
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/heightinfo.h b/src/engine/heightinfo.h
index 4614cbda9..f1f39d36e 100644
--- a/src/engine/heightinfo.h
+++ b/src/engine/heightinfo.h
@@ -7,7 +7,7 @@
 #include "qs/qs.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 
@@ -38,11 +38,11 @@ struct HeightInfo
 
   static bool skipSteepSlants;
 
-  static HeightInfo fromFloor(gsl::not_null<const world::Sector*> roomSector,
+  static HeightInfo fromFloor(gsl_lite::not_null<const world::Sector*> roomSector,
                               const core::TRVec& pos,
                               const std::map<uint16_t, gslu::nn_shared<objects::Object>>& objects);
 
-  static HeightInfo fromCeiling(gsl::not_null<const world::Sector*> roomSector,
+  static HeightInfo fromCeiling(gsl_lite::not_null<const world::Sector*> roomSector,
                                 const core::TRVec& pos,
                                 const std::map<uint16_t, gslu::nn_shared<objects::Object>>& objects);
 
@@ -65,7 +65,7 @@ struct VerticalDistances
   //! Ceiling distance relative to the object's top
   RelativeHeightInfo ceiling;
 
-  void init(const gsl::not_null<const world::Sector*>& roomSector,
+  void init(const gsl_lite::not_null<const world::Sector*>& roomSector,
             const core::TRVec& position,
             const std::map<uint16_t, gslu::nn_shared<objects::Object>>& objects,
             const core::Length& objectY,
@@ -86,4 +86,4 @@ struct VerticalDistances
       ceiling.dy -= objectY - objectHeight;
   }
 };
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/inventory.cpp b/src/engine/inventory.cpp
index 851759c00..8ad527c8a 100644
--- a/src/engine/inventory.cpp
+++ b/src/engine/inventory.cpp
@@ -124,9 +124,13 @@ size_t Inventory::put(const core::TypeId& id, world::World* world, const size_t
   }
 }
 
-bool Inventory::tryUse(objects::LaraObject& lara, const TR1ItemId id, const GameplayRules& gameplayRules)
+bool Inventory::tryUse(objects::LaraObject& lara,
+                       const TR1ItemId id,
+                       const GameplayRules& gameplayRules,
+                       const hid::InputHandler& inputHandler)
 {
-  auto tryUseWeapon = [this, &lara, &gameplayRules](TR1ItemId weapon, WeaponType weaponType) -> bool
+  auto tryUseWeapon
+    = [this, &lara, &gameplayRules, &inputHandler](const TR1ItemId weapon, const WeaponType weaponType) -> bool
   {
     if(count(weapon) == 0)
       return false;
@@ -147,15 +151,15 @@ bool Inventory::tryUse(objects::LaraObject& lara, const TR1ItemId id, const Game
       }
       else if(lara.getHandStatus() == objects::HandStatus::Combat)
       {
-        lara.setHandStatus(engine::objects::HandStatus::Holster);
-        lara.updateLarasWeaponsStatus();
+        lara.setHandStatus(objects::HandStatus::Holster);
+        lara.updateLaraWeaponsStatus(inputHandler);
       }
     }
 
     return true;
   };
 
-  auto tryUseMediPack = [this, &lara, &gameplayRules](TR1ItemId mediPack, const core::Health& healing) -> bool
+  auto tryUseMediPack = [this, &lara, &gameplayRules](const TR1ItemId mediPack, const core::Health& healing) -> bool
   {
     if(count(mediPack) == 0)
       return false;
@@ -178,8 +182,8 @@ bool Inventory::tryUse(objects::LaraObject& lara, const TR1ItemId id, const Game
 
     if(lara.getWorld().getEngine().getEngineConfig()->mediPackPreservationEnabled)
     {
-      const auto healthToRecover = core::LaraHealth - lara.m_state.health;
-      if(healthToRecover < healing * lara.getWorld().getEngine().getEngineConfig()->mediPackPreservation / 100)
+      if(const auto healthToRecover = core::LaraHealth - lara.m_state.health;
+         healthToRecover < healing * lara.getWorld().getEngine().getEngineConfig()->mediPackPreservation / 100)
       {
         lara.playSoundEffect(TR1SoundEffect::LaraNo);
         return false;
diff --git a/src/engine/inventory.h b/src/engine/inventory.h
index db6170be0..0923e5dc6 100644
--- a/src/engine/inventory.h
+++ b/src/engine/inventory.h
@@ -13,6 +13,11 @@
 #include <stdexcept>
 #include <string>
 
+namespace hid
+{
+class InputHandler;
+}
+
 namespace engine::world
 {
 class World;
@@ -39,7 +44,7 @@ struct Ammo
   uint32_t misses = 0;
   uint32_t missesTotal = 0;
 
-  void addClips(size_t n) noexcept
+  void addClips(const size_t n) noexcept
   {
     shots += shotsPerClip * n;
   }
@@ -60,7 +65,6 @@ struct Ammo
 
 class Inventory
 {
-private:
   std::map<TR1ItemId, size_t> m_inventory;
 
   Ammo m_pistolsAmmo{1, 1, TR1ItemId::Pistols, '\0'};
@@ -89,12 +93,11 @@ class Inventory
 
   [[nodiscard]] bool any() const
   {
-    return std::find_if(m_inventory.begin(),
-                        m_inventory.end(),
-                        [](const auto& kv)
-                        {
-                          return kv.second != 0;
-                        })
+    return std::ranges::find_if(m_inventory,
+                                [](const auto& kv)
+                                {
+                                  return kv.second != 0;
+                                })
            != m_inventory.end();
   }
 
@@ -103,14 +106,17 @@ class Inventory
     m_inventory.clear();
   }
 
-  void drop(TR1ItemId id) noexcept
+  void drop(const TR1ItemId id) noexcept
   {
     m_inventory.erase(id);
   }
 
-  bool tryUse(objects::LaraObject& lara, TR1ItemId id, const GameplayRules& gameplayRules);
+  bool tryUse(objects::LaraObject& lara,
+              TR1ItemId id,
+              const GameplayRules& gameplayRules,
+              const hid::InputHandler& inputHandler);
 
-  [[nodiscard]] Ammo& getAmmo(WeaponType weaponType)
+  [[nodiscard]] Ammo& getAmmo(const WeaponType weaponType)
   {
     m_pistolsAmmo.shots = 1000;
 
@@ -129,7 +135,7 @@ class Inventory
     }
   }
 
-  [[nodiscard]] const Ammo& getAmmo(WeaponType weaponType) const
+  [[nodiscard]] const Ammo& getAmmo(const WeaponType weaponType) const
   {
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast)
     return const_cast<Inventory*>(this)->getAmmo(weaponType);
diff --git a/src/engine/lara/abstractstatehandler.cpp b/src/engine/lara/abstractstatehandler.cpp
index 6b856ee53..373b532c2 100644
--- a/src/engine/lara/abstractstatehandler.cpp
+++ b/src/engine/lara/abstractstatehandler.cpp
@@ -84,7 +84,7 @@
 #include <boost/log/trivial.hpp>
 #include <boost/throw_exception.hpp>
 #include <cstdlib>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 #include <stdexcept>
@@ -92,7 +92,7 @@
 namespace engine::lara
 {
 std::unique_ptr<AbstractStateHandler> AbstractStateHandler::create(const LaraStateId id,
-                                                                   const gsl::not_null<objects::LaraObject*>& lara)
+                                                                   const gsl_lite::not_null<objects::LaraObject*>& lara)
 {
   switch(id)
   {
@@ -247,7 +247,7 @@ LaraStateId AbstractStateHandler::getCurrentAnimState() const
 void AbstractStateHandler::setAnimation(const AnimationId anim, const std::optional<core::Frame>& firstFrame)
 {
   m_lara->setAnimation(anim, firstFrame);
-  m_lara->drawRoutine();
+  m_lara->updateLogicPose();
 }
 
 const world::World& AbstractStateHandler::getWorld() const
@@ -348,20 +348,20 @@ bool AbstractStateHandler::tryClimb(const CollisionInfo& collisionInfo)
     return false;
   }
 
-  const auto floorGradient = abs(collisionInfo.frontLeft.floor.dy - collisionInfo.frontRight.floor.dy);
-  if(floorGradient >= core::MaxGrabbableGradient)
+  if(const auto floorGradient = abs(collisionInfo.frontLeft.floor.dy - collisionInfo.frontRight.floor.dy);
+     floorGradient >= core::MaxGrabbableGradient)
   {
     return false;
   }
 
-  auto alignedRotation = snapRotation(m_lara->m_state.rotation.Y, 30_deg);
+  const auto alignedRotation = snapRotation(m_lara->m_state.rotation.Y, 30_deg);
   if(!alignedRotation)
   {
     return false;
   }
 
-  const auto climbHeight = collisionInfo.front.floor.dy;
-  if(climbHeight >= -core::ClimbLimit2ClickMax && climbHeight <= -core::ClimbLimit2ClickMin)
+  if(const auto climbHeight = collisionInfo.front.floor.dy;
+     climbHeight >= -core::ClimbLimit2ClickMax && climbHeight <= -core::ClimbLimit2ClickMin)
   {
     if(climbHeight < collisionInfo.front.ceiling.dy
        || collisionInfo.frontLeft.floor.dy < collisionInfo.frontLeft.ceiling.dy
@@ -397,7 +397,7 @@ bool AbstractStateHandler::tryClimb(const CollisionInfo& collisionInfo)
     setGoalAnimState(LaraStateId::JumpUp);
     setCurrentAnimState(LaraStateId::Stop);
     setFallSpeedOverride(-(sqrt(-2 * core::Gravity * (climbHeight + 800_len)) + 3_spd));
-    m_lara->advanceFrame();
+    m_lara->advanceLaraFrame();
   }
   else
   {
@@ -443,13 +443,12 @@ bool AbstractStateHandler::checkWallCollision(const CollisionInfo& collisionInfo
 bool AbstractStateHandler::tryStartSlide(const CollisionInfo& collisionInfo)
 {
   const auto slantX = std::labs(collisionInfo.floorSlantX);
-  const auto slantZ = std::labs(collisionInfo.floorSlantZ);
-  if(slantX <= 2 && slantZ <= 2)
+  if(const auto slantZ = std::labs(collisionInfo.floorSlantZ); slantX <= 2 && slantZ <= 2)
   {
     return false;
   }
 
-  core::Angle targetAngle{0_deg};
+  auto targetAngle{0_deg};
   if(collisionInfo.floorSlantX < -2)
   {
     targetAngle = 90_deg;
@@ -614,8 +613,8 @@ void AbstractStateHandler::commonEdgeHangHandling(CollisionInfo& collisionInfo)
     return;
   }
 
-  const auto gradient = abs(collisionInfo.frontLeft.floor.dy - collisionInfo.frontRight.floor.dy);
-  if(gradient >= core::MaxGrabbableGradient || collisionInfo.mid.ceiling.dy >= 0_len
+  if(const auto gradient = abs(collisionInfo.frontLeft.floor.dy - collisionInfo.frontRight.floor.dy);
+     gradient >= core::MaxGrabbableGradient || collisionInfo.mid.ceiling.dy >= 0_len
      || collisionInfo.collisionType != CollisionInfo::AxisColl::Front || tooCloseToFloor)
   {
     m_lara->m_state.location.position = collisionInfo.initialPosition;
@@ -643,8 +642,8 @@ void AbstractStateHandler::commonEdgeHangHandling(CollisionInfo& collisionInfo)
     break;
   }
 
-  const auto spaceToReach = collisionInfo.front.floor.dy - getLara().getBoundingBox().y.min;
-  if(spaceToReach >= -core::QuarterSectorSize && spaceToReach <= core::QuarterSectorSize)
+  if(const auto spaceToReach = collisionInfo.front.floor.dy - getLara().getBoundingBox().y.min;
+     spaceToReach >= -core::QuarterSectorSize && spaceToReach <= core::QuarterSectorSize)
   {
     m_lara->m_state.location.position.Y += spaceToReach;
   }
@@ -781,6 +780,6 @@ void AbstractStateHandler::checkJumpWallSmash(CollisionInfo& collisionInfo)
 
 void AbstractStateHandler::laraAdvanceFrame()
 {
-  m_lara->advanceFrame();
+  m_lara->advanceLaraFrame();
 }
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/abstractstatehandler.h b/src/engine/lara/abstractstatehandler.h
index 0f97fc11a..e488ed638 100644
--- a/src/engine/lara/abstractstatehandler.h
+++ b/src/engine/lara/abstractstatehandler.h
@@ -36,7 +36,7 @@ namespace engine::lara
 class AbstractStateHandler
 {
 public:
-  explicit AbstractStateHandler(const gsl::not_null<objects::LaraObject*>& lara, const LaraStateId id)
+  explicit AbstractStateHandler(const gsl_lite::not_null<objects::LaraObject*>& lara, const LaraStateId id)
       : m_lara{lara}
       , m_id{id}
   {
@@ -53,7 +53,8 @@ class AbstractStateHandler
 
   virtual void handleInput(CollisionInfo& collisionInfo) = 0;
 
-  static std::unique_ptr<AbstractStateHandler> create(LaraStateId id, const gsl::not_null<objects::LaraObject*>& lara);
+  static std::unique_ptr<AbstractStateHandler> create(LaraStateId id,
+                                                      const gsl_lite::not_null<objects::LaraObject*>& lara);
 
   [[nodiscard]] LaraStateId getId() const noexcept
   {
@@ -61,7 +62,7 @@ class AbstractStateHandler
   }
 
 private:
-  gsl::not_null<objects::LaraObject*> m_lara;
+  gsl_lite::not_null<objects::LaraObject*> m_lara;
   LaraStateId m_id;
 
   friend class StateHandler_2;
@@ -150,4 +151,4 @@ class AbstractStateHandler
 
   void laraAdvanceFrame();
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_0.h b/src/engine/lara/statehandler_0.h
index 1da78e6c8..21458d605 100644
--- a/src/engine/lara/statehandler_0.h
+++ b/src/engine/lara/statehandler_0.h
@@ -4,6 +4,7 @@
 #include "core/magic.h"
 #include "core/units.h"
 #include "engine/collisioninfo.h"
+#include "engine/engine.h"
 #include "engine/objects/laraobject.h"
 #include "engine/presenter.h"
 #include "engine/skeletalmodelnode.h"
@@ -12,14 +13,14 @@
 #include "hid/inputhandler.h"
 #include "hid/inputstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_0 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_0(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_0(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::WalkForward}
   {
   }
@@ -32,18 +33,19 @@ class StateHandler_0 final : public AbstractStateHandler
       return;
     }
 
-    if(getWorld().getPresenter().getInputHandler().getInputState().xMovement == hid::AxisMovement::Left)
+    const auto& inputHandler = getWorld().getPresenter().getInputHandler();
+    if(inputHandler.getInputState().xMovement == hid::AxisMovement::Left)
     {
       subYRotationSpeed(core::SlowTurnSpeedAcceleration, -core::SlowTurnSpeed);
     }
-    else if(getWorld().getPresenter().getInputHandler().getInputState().xMovement == hid::AxisMovement::Right)
+    else if(inputHandler.getInputState().xMovement == hid::AxisMovement::Right)
     {
       addYRotationSpeed(core::SlowTurnSpeedAcceleration, core::SlowTurnSpeed);
     }
 
-    if(getWorld().getPresenter().getInputHandler().getInputState().zMovement == hid::AxisMovement::Forward)
+    if(inputHandler.getInputState().zMovement == hid::AxisMovement::Forward)
     {
-      if(getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Walk))
+      if(inputHandler.hasAction(hid::Action::Walk))
       {
         setGoalAnimState(LaraStateId::WalkForward);
       }
@@ -84,8 +86,7 @@ class StateHandler_0 final : public AbstractStateHandler
 
     if(checkWallCollision(collisionInfo))
     {
-      const auto fr = getLara().getSkeleton()->getFrame();
-      if(fr >= 29_frame && fr <= 47_frame)
+      if(const auto fr = getLara().getSkeleton()->getFrame(); fr >= 29_frame && fr <= 47_frame)
       {
         setAnimation(AnimationId::END_WALK_LEFT);
       }
@@ -110,8 +111,7 @@ class StateHandler_0 final : public AbstractStateHandler
 
     if(collisionInfo.mid.floor.dy > core::SteppableHeight)
     {
-      const auto fr = getLara().getSkeleton()->getFrame();
-      if(fr < 28_frame || fr > 45_frame)
+      if(const auto fr = getLara().getSkeleton()->getFrame(); fr < 28_frame || fr > 45_frame)
       {
         setAnimation(AnimationId::WALK_DOWN_RIGHT);
       }
@@ -123,8 +123,7 @@ class StateHandler_0 final : public AbstractStateHandler
 
     if(collisionInfo.mid.floor.dy >= -core::ClimbLimit2ClickMin && collisionInfo.mid.floor.dy < -core::SteppableHeight)
     {
-      const auto fr = getLara().getSkeleton()->getFrame();
-      if(fr < 27_frame || fr > 44_frame)
+      if(const auto fr = getLara().getSkeleton()->getFrame(); fr < 27_frame || fr > 44_frame)
       {
         setAnimation(AnimationId::WALK_UP_STEP_RIGHT);
       }
@@ -140,4 +139,4 @@ class StateHandler_0 final : public AbstractStateHandler
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_1.h b/src/engine/lara/statehandler_1.h
index 1e312a12f..a4d14f274 100644
--- a/src/engine/lara/statehandler_1.h
+++ b/src/engine/lara/statehandler_1.h
@@ -10,14 +10,14 @@
 #include "hid/inputstate.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_1 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_1(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_1(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::RunForward}
   {
   }
@@ -148,4 +148,4 @@ class StateHandler_1 final : public AbstractStateHandler
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_10.h b/src/engine/lara/statehandler_10.h
index 9dbd7a862..83823892a 100644
--- a/src/engine/lara/statehandler_10.h
+++ b/src/engine/lara/statehandler_10.h
@@ -8,14 +8,14 @@
 #include "hid/actions.h"
 #include "hid/inputstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_10 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_10(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_10(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::Hang}
   {
   }
@@ -24,8 +24,8 @@ class StateHandler_10 final : public AbstractStateHandler
   {
     getWorld().getCameraController().setRotationAroundLara(-60_deg, 0_deg);
     collisionInfo.policies &= ~CollisionInfo::SpazPushPolicy;
-    const auto& inputState = getWorld().getPresenter().getInputHandler().getInputState();
-    if(inputState.xMovement == hid::AxisMovement::Left || inputState.stepMovement == hid::AxisMovement::Left)
+    if(const auto& inputState = getWorld().getPresenter().getInputHandler().getInputState();
+       inputState.xMovement == hid::AxisMovement::Left || inputState.stepMovement == hid::AxisMovement::Left)
     {
       setGoalAnimState(LaraStateId::ShimmyLeft);
     }
@@ -44,7 +44,8 @@ class StateHandler_10 final : public AbstractStateHandler
       return;
     }
 
-    if(getWorld().getPresenter().getInputHandler().getInputState().zMovement != hid::AxisMovement::Forward)
+    const auto& inputHandler = getWorld().getPresenter().getInputHandler();
+    if(inputHandler.getInputState().zMovement != hid::AxisMovement::Forward)
     {
       return;
     }
@@ -52,14 +53,14 @@ class StateHandler_10 final : public AbstractStateHandler
     const auto frontHeight = collisionInfo.front.floor.dy;
     const auto frontSpace = frontHeight - collisionInfo.front.ceiling.dy;
     const auto frontLeftSpace = collisionInfo.frontLeft.floor.dy - collisionInfo.frontLeft.ceiling.dy;
-    const auto frontRightSpace = collisionInfo.frontRight.floor.dy - collisionInfo.frontRight.ceiling.dy;
-    if(frontHeight <= -850_len || frontHeight >= -650_len || frontSpace < 0_len || frontLeftSpace < 0_len
+    if(const auto frontRightSpace = collisionInfo.frontRight.floor.dy - collisionInfo.frontRight.ceiling.dy;
+       frontHeight <= -850_len || frontHeight >= -650_len || frontSpace < 0_len || frontLeftSpace < 0_len
        || frontRightSpace < 0_len || collisionInfo.hasStaticMeshCollision)
     {
       return;
     }
 
-    if(getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Walk))
+    if(inputHandler.hasAction(hid::Action::Walk))
     {
       setGoalAnimState(LaraStateId::Handstand);
     }
@@ -69,4 +70,4 @@ class StateHandler_10 final : public AbstractStateHandler
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_11.h b/src/engine/lara/statehandler_11.h
index 68659865b..4a7cbea8c 100644
--- a/src/engine/lara/statehandler_11.h
+++ b/src/engine/lara/statehandler_11.h
@@ -9,14 +9,14 @@
 #include "engine/heightinfo.h"
 #include "qs/quantity.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_11 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_11(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_11(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::Reach}
   {
   }
@@ -85,7 +85,7 @@ class StateHandler_11 final : public AbstractStateHandler
       return false;
     }
 
-    auto alignedRotation = snapRotation(getLara().m_state.rotation.Y, 35_deg);
+    const auto alignedRotation = snapRotation(getLara().m_state.rotation.Y, 35_deg);
     if(!alignedRotation.has_value())
     {
       return false;
@@ -146,4 +146,4 @@ class StateHandler_11 final : public AbstractStateHandler
     placeOnFloor(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_12.h b/src/engine/lara/statehandler_12.h
index 8d5f04244..443617ac3 100644
--- a/src/engine/lara/statehandler_12.h
+++ b/src/engine/lara/statehandler_12.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_12 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_12(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_12(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::Unknown12}
   {
   }
@@ -31,4 +31,4 @@ class StateHandler_12 final : public AbstractStateHandler
     applyShift(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_13.h b/src/engine/lara/statehandler_13.h
index cef2e97a4..0b6eb0857 100644
--- a/src/engine/lara/statehandler_13.h
+++ b/src/engine/lara/statehandler_13.h
@@ -8,14 +8,14 @@
 #include "statehandler_underwater.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_13 final : public StateHandler_Underwater
 {
 public:
-  explicit StateHandler_13(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_13(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Underwater{lara, LaraStateId::UnderwaterStop}
   {
   }
@@ -28,9 +28,10 @@ class StateHandler_13 final : public StateHandler_Underwater
       return;
     }
 
-    handleDiveRotationInput();
+    const auto& inputHandler = getWorld().getPresenter().getInputHandler();
+    handleDiveRotationInput(inputHandler.getInputState().xMovement, inputHandler.getInputState().zMovement);
 
-    if(getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Jump))
+    if(inputHandler.hasAction(hid::Action::Jump))
     {
       setGoalAnimState(LaraStateId::UnderwaterForward);
     }
@@ -38,4 +39,4 @@ class StateHandler_13 final : public StateHandler_Underwater
     getLara().m_state.fallspeed = std::max(0_spd, getLara().m_state.fallspeed - core::Gravity * 1_frame);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_14.h b/src/engine/lara/statehandler_14.h
index 784a4a6c2..181f7794c 100644
--- a/src/engine/lara/statehandler_14.h
+++ b/src/engine/lara/statehandler_14.h
@@ -4,14 +4,14 @@
 #include "engine/collisioninfo.h"
 #include "statehandler_standing.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_14 final : public StateHandler_Standing
 {
 public:
-  explicit StateHandler_14(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_14(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Standing{lara, LaraStateId::GrabToFall}
   {
   }
@@ -20,4 +20,4 @@ class StateHandler_14 final : public StateHandler_Standing
   {
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_15.h b/src/engine/lara/statehandler_15.h
index b5be285ce..ec9ef3999 100644
--- a/src/engine/lara/statehandler_15.h
+++ b/src/engine/lara/statehandler_15.h
@@ -8,14 +8,14 @@
 #include "hid/inputstate.h"
 #include "util/helpers.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_15 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_15(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_15(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::JumpPrepare}
   {
   }
@@ -37,27 +37,28 @@ class StateHandler_15 final : public AbstractStateHandler
 
   void handleInput(CollisionInfo& /*collisionInfo*/) override
   {
-    if(getWorld().getPresenter().getInputHandler().getInputState().zMovement == hid::AxisMovement::Forward
+    const auto& inputHandler = getWorld().getPresenter().getInputHandler();
+    if(inputHandler.getInputState().zMovement == hid::AxisMovement::Forward
        && getRelativeHeightAtDirection(getLara().m_state.rotation.Y, 256_len) >= -core::ClimbLimit2ClickMin)
     {
       setMovementAngle(getLara().m_state.rotation.Y);
       setGoalAnimState(LaraStateId::JumpForward);
     }
-    else if(getWorld().getPresenter().getInputHandler().getInputState().xMovement == hid::AxisMovement::Left
+    else if(inputHandler.getInputState().xMovement == hid::AxisMovement::Left
             && getRelativeHeightAtDirection(getLara().m_state.rotation.Y - 90_deg, 256_len)
                  >= -core::ClimbLimit2ClickMin)
     {
       setMovementAngle(getLara().m_state.rotation.Y - 90_deg);
       setGoalAnimState(LaraStateId::JumpRight);
     }
-    else if(getWorld().getPresenter().getInputHandler().getInputState().xMovement == hid::AxisMovement::Right
+    else if(inputHandler.getInputState().xMovement == hid::AxisMovement::Right
             && getRelativeHeightAtDirection(getLara().m_state.rotation.Y + 90_deg, 256_len)
                  >= -core::ClimbLimit2ClickMin)
     {
       setMovementAngle(getLara().m_state.rotation.Y + 90_deg);
       setGoalAnimState(LaraStateId::JumpLeft);
     }
-    else if(getWorld().getPresenter().getInputHandler().getInputState().zMovement == hid::AxisMovement::Backward
+    else if(inputHandler.getInputState().zMovement == hid::AxisMovement::Backward
             && getRelativeHeightAtDirection(getLara().m_state.rotation.Y + 180_deg, 256_len)
                  >= -core::ClimbLimit2ClickMin)
     {
@@ -93,4 +94,4 @@ class StateHandler_15 final : public AbstractStateHandler
     getLara().m_state.location.position = collisionInfo.initialPosition;
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_16.h b/src/engine/lara/statehandler_16.h
index c61fabe38..54a720c75 100644
--- a/src/engine/lara/statehandler_16.h
+++ b/src/engine/lara/statehandler_16.h
@@ -7,14 +7,14 @@
 #include "hid/actions.h"
 #include "hid/inputstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_16 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_16(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_16(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::WalkBackward}
   {
   }
@@ -89,4 +89,4 @@ class StateHandler_16 final : public AbstractStateHandler
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_17.h b/src/engine/lara/statehandler_17.h
index 3a0c1e56e..c29b33de7 100644
--- a/src/engine/lara/statehandler_17.h
+++ b/src/engine/lara/statehandler_17.h
@@ -9,14 +9,14 @@
 #include "statehandler_underwater.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_17 final : public StateHandler_Underwater
 {
 public:
-  explicit StateHandler_17(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_17(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Underwater{lara, LaraStateId::UnderwaterForward}
   {
   }
@@ -29,9 +29,10 @@ class StateHandler_17 final : public StateHandler_Underwater
       return;
     }
 
-    handleDiveRotationInput();
+    const auto& inputHandler = getWorld().getPresenter().getInputHandler();
+    handleDiveRotationInput(inputHandler.getInputState().xMovement, inputHandler.getInputState().zMovement);
 
-    if(!getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Jump))
+    if(!inputHandler.hasAction(hid::Action::Jump))
     {
       setGoalAnimState(LaraStateId::UnderwaterInertia);
     }
@@ -39,4 +40,4 @@ class StateHandler_17 final : public StateHandler_Underwater
     getLara().m_state.fallspeed = std::min(getLara().m_state.fallspeed + 8_spd, 200_spd);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_18.h b/src/engine/lara/statehandler_18.h
index ae08c07f9..575b6bfbf 100644
--- a/src/engine/lara/statehandler_18.h
+++ b/src/engine/lara/statehandler_18.h
@@ -9,14 +9,14 @@
 #include "statehandler_underwater.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_18 final : public StateHandler_Underwater
 {
 public:
-  explicit StateHandler_18(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_18(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Underwater{lara, LaraStateId::UnderwaterInertia}
   {
   }
@@ -29,9 +29,10 @@ class StateHandler_18 final : public StateHandler_Underwater
       return;
     }
 
-    handleDiveRotationInput();
+    const auto& inputHandler = getWorld().getPresenter().getInputHandler();
+    handleDiveRotationInput(inputHandler.getInputState().xMovement, inputHandler.getInputState().zMovement);
 
-    if(getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Jump))
+    if(inputHandler.hasAction(hid::Action::Jump))
     {
       setGoalAnimState(LaraStateId::UnderwaterForward);
     }
@@ -43,4 +44,4 @@ class StateHandler_18 final : public StateHandler_Underwater
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_19.h b/src/engine/lara/statehandler_19.h
index eaa9e2a2c..b6e3605d8 100644
--- a/src/engine/lara/statehandler_19.h
+++ b/src/engine/lara/statehandler_19.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_19 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_19(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_19(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::Climbing}
   {
   }
@@ -33,4 +33,4 @@ class StateHandler_19 final : public AbstractStateHandler
     setMovementAngle(collisionInfo.facingAngle);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_2.h b/src/engine/lara/statehandler_2.h
index b6e3ec2f2..4e246f015 100644
--- a/src/engine/lara/statehandler_2.h
+++ b/src/engine/lara/statehandler_2.h
@@ -8,14 +8,14 @@
 #include "engine/objects/laraobject.h"
 #include "statehandler_standing.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_2 final : public StateHandler_Standing
 {
 public:
-  explicit StateHandler_2(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_2(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Standing{lara, LaraStateId::Stop}
   {
   }
@@ -135,4 +135,4 @@ class StateHandler_2 final : public StateHandler_Standing
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_20.h b/src/engine/lara/statehandler_20.h
index 1f79d063a..3a918ddef 100644
--- a/src/engine/lara/statehandler_20.h
+++ b/src/engine/lara/statehandler_20.h
@@ -8,14 +8,14 @@
 #include "hid/inputstate.h"
 #include "statehandler_standing.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_20 final : public StateHandler_Standing
 {
 public:
-  explicit StateHandler_20(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_20(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Standing{lara, LaraStateId::TurnFast}
   {
   }
@@ -49,4 +49,4 @@ class StateHandler_20 final : public StateHandler_Standing
     setGoalAnimState(LaraStateId::Stop);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_21.h b/src/engine/lara/statehandler_21.h
index 2628f3dfe..51c0bea73 100644
--- a/src/engine/lara/statehandler_21.h
+++ b/src/engine/lara/statehandler_21.h
@@ -5,16 +5,16 @@
 #include "hid/inputstate.h"
 #include "statehandler_sidestep.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_21 final : public StateHandler_SideStep
 {
 public:
-  explicit StateHandler_21(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_21(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_SideStep{lara, LaraStateId::StepRight, hid::AxisMovement::Right, 90_deg}
   {
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_22.h b/src/engine/lara/statehandler_22.h
index 8e12a7ffe..352de2980 100644
--- a/src/engine/lara/statehandler_22.h
+++ b/src/engine/lara/statehandler_22.h
@@ -2,16 +2,16 @@
 
 #include "abstractstatehandler.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_22 final : public StateHandler_SideStep
 {
 public:
-  explicit StateHandler_22(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_22(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_SideStep{lara, LaraStateId::StepLeft, hid::AxisMovement::Left, -90_deg}
   {
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_23.h b/src/engine/lara/statehandler_23.h
index a4ebf589d..4d5752376 100644
--- a/src/engine/lara/statehandler_23.h
+++ b/src/engine/lara/statehandler_23.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_23 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_23(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_23(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::RollBackward}
   {
   }
@@ -57,4 +57,4 @@ class StateHandler_23 final : public AbstractStateHandler
     getLara().m_state.falling = true;
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_24.h b/src/engine/lara/statehandler_24.h
index 2aac82002..c0b5ca791 100644
--- a/src/engine/lara/statehandler_24.h
+++ b/src/engine/lara/statehandler_24.h
@@ -5,14 +5,14 @@
 #include "engine/collisioninfo.h"
 #include "hid/actions.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_24 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_24(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_24(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::SlideForward}
   {
   }
@@ -34,4 +34,4 @@ class StateHandler_24 final : public AbstractStateHandler
     commonSlideHandling(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_25.h b/src/engine/lara/statehandler_25.h
index ab36498fd..4eb4d210f 100644
--- a/src/engine/lara/statehandler_25.h
+++ b/src/engine/lara/statehandler_25.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_25 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_25(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_25(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::JumpBack}
   {
   }
@@ -32,4 +32,4 @@ class StateHandler_25 final : public AbstractStateHandler
     commonJumpHandling(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_26.h b/src/engine/lara/statehandler_26.h
index 1d3dd269e..aee566377 100644
--- a/src/engine/lara/statehandler_26.h
+++ b/src/engine/lara/statehandler_26.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_26 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_26(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_26(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::JumpLeft}
   {
   }
@@ -31,4 +31,4 @@ class StateHandler_26 final : public AbstractStateHandler
     commonJumpHandling(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_27.h b/src/engine/lara/statehandler_27.h
index 7e33e9c56..3002eac82 100644
--- a/src/engine/lara/statehandler_27.h
+++ b/src/engine/lara/statehandler_27.h
@@ -5,14 +5,14 @@
 #include "engine/collisioninfo.h"
 
 #include <core/magic.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_27 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_27(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_27(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::JumpRight}
   {
   }
@@ -31,4 +31,4 @@ class StateHandler_27 final : public AbstractStateHandler
     commonJumpHandling(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_28.h b/src/engine/lara/statehandler_28.h
index 9931aeafd..81d07b119 100644
--- a/src/engine/lara/statehandler_28.h
+++ b/src/engine/lara/statehandler_28.h
@@ -6,14 +6,14 @@
 #include "engine/collisioninfo.h"
 #include "qs/quantity.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_28 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_28(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_28(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::JumpUp}
   {
   }
@@ -88,7 +88,7 @@ class StateHandler_28 final : public AbstractStateHandler
       return false;
     }
 
-    auto alignedRotation = snapRotation(getLara().m_state.rotation.Y, 35_deg);
+    const auto alignedRotation = snapRotation(getLara().m_state.rotation.Y, 35_deg);
     if(!alignedRotation.has_value())
     {
       return false;
@@ -110,4 +110,4 @@ class StateHandler_28 final : public AbstractStateHandler
     return true;
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_29.h b/src/engine/lara/statehandler_29.h
index 1eff5125a..c8f55de64 100644
--- a/src/engine/lara/statehandler_29.h
+++ b/src/engine/lara/statehandler_29.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_29 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_29(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_29(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::FallBackward}
   {
   }
@@ -60,4 +60,4 @@ class StateHandler_29 final : public AbstractStateHandler
     placeOnFloor(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_3.h b/src/engine/lara/statehandler_3.h
index 26014532d..5d7d11fe0 100644
--- a/src/engine/lara/statehandler_3.h
+++ b/src/engine/lara/statehandler_3.h
@@ -7,14 +7,14 @@
 #include "hid/actions.h"
 #include "hid/inputstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_3 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_3(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_3(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::JumpForward}
   {
   }
@@ -74,12 +74,13 @@ class StateHandler_3 final : public AbstractStateHandler
       return;
     }
 
+    const auto& inputHandler = getWorld().getPresenter().getInputHandler();
     if(applyLandingDamage())
     {
       setGoalAnimState(LaraStateId::Death);
     }
-    else if(getWorld().getPresenter().getInputHandler().getInputState().zMovement != hid::AxisMovement::Forward
-            || getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Walk))
+    else if(inputHandler.getInputState().zMovement != hid::AxisMovement::Forward
+            || inputHandler.hasAction(hid::Action::Walk))
     {
       setGoalAnimState(LaraStateId::Stop);
     }
@@ -96,4 +97,4 @@ class StateHandler_3 final : public AbstractStateHandler
     laraAdvanceFrame();
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_30.h b/src/engine/lara/statehandler_30.h
index 30f70ca83..64debcc0d 100644
--- a/src/engine/lara/statehandler_30.h
+++ b/src/engine/lara/statehandler_30.h
@@ -5,14 +5,14 @@
 #include "engine/collisioninfo.h"
 #include "hid/inputstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_30 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_30(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_30(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::ShimmyLeft}
   {
   }
@@ -36,4 +36,4 @@ class StateHandler_30 final : public AbstractStateHandler
     setMovementAngle(getLara().m_state.rotation.Y - 90_deg);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_31.h b/src/engine/lara/statehandler_31.h
index 111aeeaef..1890342c5 100644
--- a/src/engine/lara/statehandler_31.h
+++ b/src/engine/lara/statehandler_31.h
@@ -5,14 +5,14 @@
 #include "engine/collisioninfo.h"
 #include "hid/inputstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_31 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_31(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_31(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::ShimmyRight}
   {
   }
@@ -36,4 +36,4 @@ class StateHandler_31 final : public AbstractStateHandler
     setMovementAngle(getLara().m_state.rotation.Y + 90_deg);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_32.h b/src/engine/lara/statehandler_32.h
index aec9306aa..75df73410 100644
--- a/src/engine/lara/statehandler_32.h
+++ b/src/engine/lara/statehandler_32.h
@@ -5,14 +5,14 @@
 #include "engine/collisioninfo.h"
 #include "hid/actions.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_32 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_32(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_32(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::SlideBackward}
   {
   }
@@ -32,4 +32,4 @@ class StateHandler_32 final : public AbstractStateHandler
     commonSlideHandling(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_33.h b/src/engine/lara/statehandler_33.h
index 22413ddc4..9f0924464 100644
--- a/src/engine/lara/statehandler_33.h
+++ b/src/engine/lara/statehandler_33.h
@@ -8,14 +8,14 @@
 #include "statehandler_onwater.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_33 final : public StateHandler_OnWater
 {
 public:
-  explicit StateHandler_33(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_33(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_OnWater{lara, LaraStateId::OnWaterStop}
   {
   }
@@ -136,4 +136,4 @@ class StateHandler_33 final : public StateHandler_OnWater
     commonOnWaterHandling(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_34.h b/src/engine/lara/statehandler_34.h
index 9665f3266..ad0f637e4 100644
--- a/src/engine/lara/statehandler_34.h
+++ b/src/engine/lara/statehandler_34.h
@@ -10,14 +10,14 @@
 #include "statehandler_onwater.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_34 final : public StateHandler_OnWater
 {
 public:
-  explicit StateHandler_34(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_34(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_OnWater{lara, LaraStateId::OnWaterForward}
   {
   }
@@ -65,4 +65,4 @@ class StateHandler_34 final : public StateHandler_OnWater
     commonOnWaterHandling(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_35.h b/src/engine/lara/statehandler_35.h
index 64205434e..f5a889fff 100644
--- a/src/engine/lara/statehandler_35.h
+++ b/src/engine/lara/statehandler_35.h
@@ -7,14 +7,14 @@
 #include "hid/inputstate.h"
 #include "statehandler_underwater.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_35 final : public StateHandler_Underwater
 {
 public:
-  explicit StateHandler_35(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_35(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Underwater{lara, LaraStateId::UnderwaterDiving}
   {
   }
@@ -27,4 +27,4 @@ class StateHandler_35 final : public StateHandler_Underwater
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_36.h b/src/engine/lara/statehandler_36.h
index a76e0f714..025c60084 100644
--- a/src/engine/lara/statehandler_36.h
+++ b/src/engine/lara/statehandler_36.h
@@ -3,16 +3,16 @@
 #include "abstractstatehandler.h"
 #include "statehandler_pushable.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_36 final : public StateHandler_Pushable
 {
 public:
-  explicit StateHandler_36(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_36(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Pushable{lara, LaraStateId::PushablePush}
   {
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_37.h b/src/engine/lara/statehandler_37.h
index b62a47236..0fce42b67 100644
--- a/src/engine/lara/statehandler_37.h
+++ b/src/engine/lara/statehandler_37.h
@@ -4,16 +4,16 @@
 #include "engine/objects/laraobject.h"
 #include "statehandler_pushable.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_37 final : public StateHandler_Pushable
 {
 public:
-  explicit StateHandler_37(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_37(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Pushable{lara, LaraStateId::PushablePull}
   {
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_38.h b/src/engine/lara/statehandler_38.h
index ac2ae1563..ab3d8e096 100644
--- a/src/engine/lara/statehandler_38.h
+++ b/src/engine/lara/statehandler_38.h
@@ -5,14 +5,14 @@
 #include "engine/collisioninfo.h"
 #include "hid/actions.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_38 final : public StateHandler_Pushable
 {
 public:
-  explicit StateHandler_38(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_38(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Pushable{lara, LaraStateId::PushableGrab}
   {
   }
@@ -27,4 +27,4 @@ class StateHandler_38 final : public StateHandler_Pushable
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_39.h b/src/engine/lara/statehandler_39.h
index e2144e3b9..776a90d31 100644
--- a/src/engine/lara/statehandler_39.h
+++ b/src/engine/lara/statehandler_39.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_39 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_39(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_39(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::PickUp}
   {
   }
@@ -35,4 +35,4 @@ class StateHandler_39 final : public AbstractStateHandler
     setMovementAngle(collisionInfo.facingAngle);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_4.h b/src/engine/lara/statehandler_4.h
index 0db0270fc..58efb0b93 100644
--- a/src/engine/lara/statehandler_4.h
+++ b/src/engine/lara/statehandler_4.h
@@ -5,14 +5,14 @@
 #include "engine/objects/laraobject.h"
 #include "statehandler_standing.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_4 final : public StateHandler_Standing
 {
 public:
-  explicit StateHandler_4(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_4(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Standing{lara, LaraStateId::Pose}
   {
   }
@@ -21,4 +21,4 @@ class StateHandler_4 final : public StateHandler_Standing
   {
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_40.h b/src/engine/lara/statehandler_40.h
index 8092f32c5..b150fbada 100644
--- a/src/engine/lara/statehandler_40.h
+++ b/src/engine/lara/statehandler_40.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_40 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_40(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_40(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::SwitchDown}
   {
   }
@@ -35,4 +35,4 @@ class StateHandler_40 final : public AbstractStateHandler
     setMovementAngle(collisionInfo.facingAngle);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_41.h b/src/engine/lara/statehandler_41.h
index b6ec8ff62..7b7f59a45 100644
--- a/src/engine/lara/statehandler_41.h
+++ b/src/engine/lara/statehandler_41.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_41 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_41(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_41(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::SwitchUp}
   {
   }
@@ -35,4 +35,4 @@ class StateHandler_41 final : public AbstractStateHandler
     setMovementAngle(collisionInfo.facingAngle);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_42.h b/src/engine/lara/statehandler_42.h
index cd11585d9..2dccc94fe 100644
--- a/src/engine/lara/statehandler_42.h
+++ b/src/engine/lara/statehandler_42.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_42 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_42(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_42(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::InsertKey}
   {
   }
@@ -35,4 +35,4 @@ class StateHandler_42 final : public AbstractStateHandler
     setMovementAngle(collisionInfo.facingAngle);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_43.h b/src/engine/lara/statehandler_43.h
index a3c3150fa..e3a65bc19 100644
--- a/src/engine/lara/statehandler_43.h
+++ b/src/engine/lara/statehandler_43.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_43 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_43(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_43(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::InsertPuzzle}
   {
   }
@@ -35,4 +35,4 @@ class StateHandler_43 final : public AbstractStateHandler
     setMovementAngle(collisionInfo.facingAngle);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_44.h b/src/engine/lara/statehandler_44.h
index 7a543b0f7..e4827cf80 100644
--- a/src/engine/lara/statehandler_44.h
+++ b/src/engine/lara/statehandler_44.h
@@ -7,14 +7,14 @@
 #include "statehandler_underwater.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_44 final : public StateHandler_Underwater
 {
 public:
-  explicit StateHandler_44(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_44(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_Underwater{lara, LaraStateId::WaterDeath}
   {
   }
@@ -44,8 +44,8 @@ class StateHandler_44 final : public StateHandler_Underwater
     getLara().m_state.health = core::DeadHealth;
     setAir(-1_frame);
     setHandStatus(objects::HandStatus::Grabbing);
-    auto h = getLara().getWaterSurfaceHeight();
-    if(h.has_value() && *h < getLara().m_state.location.position.Y - core::DefaultCollisionRadius)
+    if(const auto h = getLara().getWaterSurfaceHeight();
+       h.has_value() && *h < getLara().m_state.location.position.Y - core::DefaultCollisionRadius)
     {
       getLara().m_state.location.position.Y -= 5_len;
     }
@@ -53,4 +53,4 @@ class StateHandler_44 final : public StateHandler_Underwater
     StateHandler_Underwater::postprocessFrame(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_45.h b/src/engine/lara/statehandler_45.h
index fcc9da10a..8265a4a65 100644
--- a/src/engine/lara/statehandler_45.h
+++ b/src/engine/lara/statehandler_45.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_45 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_45(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_45(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::RollForward}
   {
   }
@@ -58,4 +58,4 @@ class StateHandler_45 final : public AbstractStateHandler
     getLara().m_state.falling = true;
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_46.h b/src/engine/lara/statehandler_46.h
index d4ed055f9..9e7fc054e 100644
--- a/src/engine/lara/statehandler_46.h
+++ b/src/engine/lara/statehandler_46.h
@@ -4,14 +4,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_46 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_46(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_46(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::BoulderDeath}
   {
   }
@@ -19,11 +19,11 @@ class StateHandler_46 final : public AbstractStateHandler
   void handleInput(CollisionInfo& /*collisionInfo*/) override
   {
     getWorld().getCameraController().setModifier(CameraModifier::FollowCenter);
-    getWorld().getCameraController().setEyeRotation(-25_deg, 170_deg);
+    getWorld().getCameraController().setCinematicBaseRotation(-25_deg, 170_deg);
   }
 
   void postprocessFrame(CollisionInfo& /*collisionInfo*/) override
   {
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_47.h b/src/engine/lara/statehandler_47.h
index 15d8bec2b..89fa27991 100644
--- a/src/engine/lara/statehandler_47.h
+++ b/src/engine/lara/statehandler_47.h
@@ -8,14 +8,14 @@
 #include "statehandler_onwater.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_47 final : public StateHandler_OnWater
 {
 public:
-  explicit StateHandler_47(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_47(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_OnWater{lara, LaraStateId::OnWaterBackward}
   {
   }
@@ -58,4 +58,4 @@ class StateHandler_47 final : public StateHandler_OnWater
     commonOnWaterHandling(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_48.h b/src/engine/lara/statehandler_48.h
index 103bfc583..58ba0c0b2 100644
--- a/src/engine/lara/statehandler_48.h
+++ b/src/engine/lara/statehandler_48.h
@@ -8,14 +8,14 @@
 #include "statehandler_onwater.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_48 final : public StateHandler_OnWater
 {
 public:
-  explicit StateHandler_48(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_48(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_OnWater{lara, LaraStateId::OnWaterLeft}
   {
   }
@@ -58,4 +58,4 @@ class StateHandler_48 final : public StateHandler_OnWater
     commonOnWaterHandling(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_49.h b/src/engine/lara/statehandler_49.h
index b1dace573..4c395d8eb 100644
--- a/src/engine/lara/statehandler_49.h
+++ b/src/engine/lara/statehandler_49.h
@@ -8,14 +8,14 @@
 #include "statehandler_onwater.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_49 final : public StateHandler_OnWater
 {
 public:
-  explicit StateHandler_49(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_49(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_OnWater{lara, LaraStateId::OnWaterRight}
   {
   }
@@ -58,4 +58,4 @@ class StateHandler_49 final : public StateHandler_OnWater
     commonOnWaterHandling(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_5.h b/src/engine/lara/statehandler_5.h
index 28a41e972..ff0a74a4a 100644
--- a/src/engine/lara/statehandler_5.h
+++ b/src/engine/lara/statehandler_5.h
@@ -6,14 +6,14 @@
 #include "engine/collisioninfo.h"
 #include "hid/inputstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_5 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_5(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_5(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::RunBack}
   {
   }
@@ -22,8 +22,7 @@ class StateHandler_5 final : public AbstractStateHandler
   {
     setGoalAnimState(LaraStateId::Stop);
 
-    const auto& inputHandler = getWorld().getPresenter().getInputHandler();
-    switch(inputHandler.getInputState().xMovement)
+    switch(getWorld().getPresenter().getInputHandler().getInputState().xMovement)
     {
     case hid::AxisMovement::Right:
       addYRotationSpeed(core::SlowTurnSpeedAcceleration, core::RunBackTurnSpeed);
@@ -71,4 +70,4 @@ class StateHandler_5 final : public AbstractStateHandler
     placeOnFloor(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_50.h b/src/engine/lara/statehandler_50.h
index c42f10ff2..53a12a777 100644
--- a/src/engine/lara/statehandler_50.h
+++ b/src/engine/lara/statehandler_50.h
@@ -9,7 +9,7 @@
 #include "engine/world/skeletalmodeltype.h"
 
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::lara
@@ -17,7 +17,7 @@ namespace engine::lara
 class StateHandler_50 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_50(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_50(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::UseMidas}
   {
   }
@@ -55,10 +55,10 @@ class StateHandler_50 final : public AbstractStateHandler
       p.X += util::rand15s(r);
       p.Y += util::rand15s(r);
       p.Z += util::rand15s(r);
-      auto fx = gsl::make_shared<SparkleParticle>(Location{world.getObjectManager().getLara().m_state.location.room, p},
-                                                  world);
+      const auto fx = gsl_lite::make_shared<SparkleParticle>(
+        Location{world.getObjectManager().getLara().m_state.location.room, p}, world);
       world.getObjectManager().registerParticle(fx);
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_51.h b/src/engine/lara/statehandler_51.h
index 4806c3a00..1004ae74e 100644
--- a/src/engine/lara/statehandler_51.h
+++ b/src/engine/lara/statehandler_51.h
@@ -6,14 +6,14 @@
 #include "engine/collisioninfo.h"
 
 #include <gl/pixel.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_51 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_51(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_51(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::MidasDeath}
   {
   }
@@ -26,7 +26,7 @@ class StateHandler_51 final : public AbstractStateHandler
     if(alternateLara == nullptr)
       return;
 
-    static constexpr gl::SRGBA8 GoldColor{255, 192, 64, 255};
+    static const gl::SRGBA8 GoldColor{255, 192, 64, 255};
     const auto skeleton = getLara().getSkeleton();
     switch(skeleton->getLocalFrame().get())
     {
@@ -106,4 +106,4 @@ class StateHandler_51 final : public AbstractStateHandler
     setMovementAngle(collisionInfo.facingAngle);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_52.h b/src/engine/lara/statehandler_52.h
index 5c282826f..351c6f463 100644
--- a/src/engine/lara/statehandler_52.h
+++ b/src/engine/lara/statehandler_52.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_52 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_52(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_52(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::SwandiveBegin}
   {
   }
@@ -48,4 +48,4 @@ class StateHandler_52 final : public AbstractStateHandler
     placeOnFloor(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_53.h b/src/engine/lara/statehandler_53.h
index 12287ed87..32b9eb633 100644
--- a/src/engine/lara/statehandler_53.h
+++ b/src/engine/lara/statehandler_53.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_53 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_53(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_53(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::SwandiveEnd}
   {
   }
@@ -54,4 +54,4 @@ class StateHandler_53 final : public AbstractStateHandler
     placeOnFloor(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_54.h b/src/engine/lara/statehandler_54.h
index 2661101b6..f0523d0c7 100644
--- a/src/engine/lara/statehandler_54.h
+++ b/src/engine/lara/statehandler_54.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_54 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_54(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_54(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::Handstand}
   {
   }
@@ -33,4 +33,4 @@ class StateHandler_54 final : public AbstractStateHandler
     setMovementAngle(collisionInfo.facingAngle);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_55.h b/src/engine/lara/statehandler_55.h
index 2f5b702a3..7cc1d38f0 100644
--- a/src/engine/lara/statehandler_55.h
+++ b/src/engine/lara/statehandler_55.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_55 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_55(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_55(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::OnWaterExit}
   {
   }
@@ -34,4 +34,4 @@ class StateHandler_55 final : public AbstractStateHandler
     setMovementAngle(collisionInfo.facingAngle);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_6.h b/src/engine/lara/statehandler_6.h
index bf9217a55..90e308be6 100644
--- a/src/engine/lara/statehandler_6.h
+++ b/src/engine/lara/statehandler_6.h
@@ -6,14 +6,14 @@
 #include "engine/objects/laraobject.h"
 #include "statehandler_turnslow.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_6 final : public StateHandler_TurnSlow
 {
 public:
-  explicit StateHandler_6(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_6(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_TurnSlow{lara, LaraStateId::TurnRightSlow}
   {
   }
@@ -64,4 +64,4 @@ class StateHandler_6 final : public StateHandler_TurnSlow
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_7.h b/src/engine/lara/statehandler_7.h
index 69d85f3bb..0a65f5acc 100644
--- a/src/engine/lara/statehandler_7.h
+++ b/src/engine/lara/statehandler_7.h
@@ -6,14 +6,14 @@
 #include "engine/objects/laraobject.h"
 #include "statehandler_turnslow.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_7 final : public StateHandler_TurnSlow
 {
 public:
-  explicit StateHandler_7(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_7(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : StateHandler_TurnSlow{lara, LaraStateId::TurnLeftSlow}
   {
   }
@@ -64,4 +64,4 @@ class StateHandler_7 final : public StateHandler_TurnSlow
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_8.h b/src/engine/lara/statehandler_8.h
index 75ce26a5c..9bf2d92d7 100644
--- a/src/engine/lara/statehandler_8.h
+++ b/src/engine/lara/statehandler_8.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_8 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_8(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_8(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::Death}
   {
   }
@@ -36,4 +36,4 @@ class StateHandler_8 final : public AbstractStateHandler
     setAir(-1_frame);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_9.h b/src/engine/lara/statehandler_9.h
index 7f68267c9..86dca22bc 100644
--- a/src/engine/lara/statehandler_9.h
+++ b/src/engine/lara/statehandler_9.h
@@ -6,14 +6,14 @@
 #include "engine/collisioninfo.h"
 #include "engine/objects/laraobject.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_9 final : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_9(const gsl::not_null<objects::LaraObject*>& lara)
+  explicit StateHandler_9(const gsl_lite::not_null<objects::LaraObject*>& lara)
       : AbstractStateHandler{lara, LaraStateId::FreeFall}
   {
   }
@@ -59,4 +59,4 @@ class StateHandler_9 final : public AbstractStateHandler
     placeOnFloor(collisionInfo);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_onwater.h b/src/engine/lara/statehandler_onwater.h
index e43244a07..7e3080f5c 100644
--- a/src/engine/lara/statehandler_onwater.h
+++ b/src/engine/lara/statehandler_onwater.h
@@ -9,7 +9,7 @@
 #include "qs/quantity.h"
 
 #include <boost/throw_exception.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <stdexcept>
 
 namespace engine::lara
@@ -17,7 +17,7 @@ namespace engine::lara
 class StateHandler_OnWater : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_OnWater(const gsl::not_null<objects::LaraObject*>& lara, const LaraStateId id)
+  explicit StateHandler_OnWater(const gsl_lite::not_null<objects::LaraObject*>& lara, const LaraStateId id)
       : AbstractStateHandler{lara, id}
   {
   }
@@ -57,8 +57,8 @@ class StateHandler_OnWater : public AbstractStateHandler
       }
     }
 
-    auto wsh = getLara().getWaterSurfaceHeight();
-    if(wsh.has_value() && *wsh > getLara().m_state.location.position.Y - core::DefaultCollisionRadius)
+    if(const auto wsh = getLara().getWaterSurfaceHeight();
+       wsh.has_value() && *wsh > getLara().m_state.location.position.Y - core::DefaultCollisionRadius)
     {
       tryClimbOutOfWater(collisionInfo);
       return;
@@ -90,8 +90,8 @@ class StateHandler_OnWater : public AbstractStateHandler
       return;
     }
 
-    const auto gradient = abs(collisionInfo.frontLeft.floor.dy - collisionInfo.frontRight.floor.dy);
-    if(gradient >= core::MaxGrabbableGradient)
+    if(const auto gradient = abs(collisionInfo.frontLeft.floor.dy - collisionInfo.frontRight.floor.dy);
+       gradient >= core::MaxGrabbableGradient)
     {
       return;
     }
@@ -156,4 +156,4 @@ class StateHandler_OnWater : public AbstractStateHandler
     setUnderwaterState(objects::UnderwaterState::OnLand);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_pushable.h b/src/engine/lara/statehandler_pushable.h
index b53aff302..0a5d6a012 100644
--- a/src/engine/lara/statehandler_pushable.h
+++ b/src/engine/lara/statehandler_pushable.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_Pushable : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_Pushable(const gsl::not_null<objects::LaraObject*>& lara, const LaraStateId id)
+  explicit StateHandler_Pushable(const gsl_lite::not_null<objects::LaraObject*>& lara, const LaraStateId id)
       : AbstractStateHandler{lara, id}
   {
   }
@@ -35,4 +35,4 @@ class StateHandler_Pushable : public AbstractStateHandler
     setMovementAngle(collisionInfo.facingAngle);
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_sidestep.h b/src/engine/lara/statehandler_sidestep.h
index 340246d69..fb6cd6f4d 100644
--- a/src/engine/lara/statehandler_sidestep.h
+++ b/src/engine/lara/statehandler_sidestep.h
@@ -6,14 +6,14 @@
 #include "engine/collisioninfo.h"
 #include "hid/inputstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_SideStep : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_SideStep(const gsl::not_null<objects::LaraObject*>& lara,
+  explicit StateHandler_SideStep(const gsl_lite::not_null<objects::LaraObject*>& lara,
                                  const LaraStateId& stateId,
                                  const hid::AxisMovement& inputAxis,
                                  const core::Angle& rotation)
@@ -85,4 +85,4 @@ class StateHandler_SideStep : public AbstractStateHandler
   hid::AxisMovement m_inputAxis;
   core::Angle m_rotation;
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_standing.h b/src/engine/lara/statehandler_standing.h
index 0ef3080d6..20e192cb7 100644
--- a/src/engine/lara/statehandler_standing.h
+++ b/src/engine/lara/statehandler_standing.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_Standing : public AbstractStateHandler
 {
 protected:
-  explicit StateHandler_Standing(const gsl::not_null<objects::LaraObject*>& lara, const LaraStateId id)
+  explicit StateHandler_Standing(const gsl_lite::not_null<objects::LaraObject*>& lara, const LaraStateId id)
       : AbstractStateHandler{lara, id}
   {
   }
@@ -53,4 +53,4 @@ class StateHandler_Standing : public AbstractStateHandler
     getLara().m_state.falling = true;
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_turnslow.h b/src/engine/lara/statehandler_turnslow.h
index 5743ba509..7d9351f4e 100644
--- a/src/engine/lara/statehandler_turnslow.h
+++ b/src/engine/lara/statehandler_turnslow.h
@@ -5,14 +5,14 @@
 #include "core/units.h"
 #include "engine/collisioninfo.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_TurnSlow : public AbstractStateHandler
 {
 protected:
-  explicit StateHandler_TurnSlow(const gsl::not_null<objects::LaraObject*>& lara, const LaraStateId id)
+  explicit StateHandler_TurnSlow(const gsl_lite::not_null<objects::LaraObject*>& lara, const LaraStateId id)
       : AbstractStateHandler{lara, id}
   {
   }
@@ -48,4 +48,4 @@ class StateHandler_TurnSlow : public AbstractStateHandler
     getLara().m_state.falling = true;
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/lara/statehandler_underwater.h b/src/engine/lara/statehandler_underwater.h
index e8ceee499..03a01afea 100644
--- a/src/engine/lara/statehandler_underwater.h
+++ b/src/engine/lara/statehandler_underwater.h
@@ -6,14 +6,14 @@
 #include "engine/collisioninfo.h"
 #include "hid/inputstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::lara
 {
 class StateHandler_Underwater : public AbstractStateHandler
 {
 public:
-  explicit StateHandler_Underwater(const gsl::not_null<objects::LaraObject*>& lara, const LaraStateId id)
+  explicit StateHandler_Underwater(const gsl_lite::not_null<objects::LaraObject*>& lara, const LaraStateId id)
       : AbstractStateHandler{lara, id}
   {
   }
@@ -82,10 +82,9 @@ class StateHandler_Underwater : public AbstractStateHandler
   }
 
 protected:
-  void handleDiveRotationInput()
+  void handleDiveRotationInput(const hid::AxisMovement& xMovement, const hid::AxisMovement& zMovement)
   {
-    const auto& inputHandler = getWorld().getPresenter().getInputHandler();
-    switch(inputHandler.getInputState().zMovement)
+    switch(zMovement)
     {
     case hid::AxisMovement::Forward:
       getLara().m_state.rotation.X -= core::DiveRotationSpeedX * 1_frame;
@@ -97,7 +96,7 @@ class StateHandler_Underwater : public AbstractStateHandler
       break;
     }
 
-    switch(inputHandler.getInputState().xMovement)
+    switch(xMovement)
     {
     case hid::AxisMovement::Right:
       getLara().m_state.rotation.Y += core::DiveRotationSpeedY * 1_frame;
@@ -112,4 +111,4 @@ class StateHandler_Underwater : public AbstractStateHandler
     }
   }
 };
-} // namespace engine::lara
+} // namespace engine::lara
\ No newline at end of file
diff --git a/src/engine/levelloop.cpp b/src/engine/levelloop.cpp
new file mode 100644
index 000000000..4a158e7d5
--- /dev/null
+++ b/src/engine/levelloop.cpp
@@ -0,0 +1,363 @@
+#include "levelloop.h"
+
+#include "audioengine.h"
+#include "cameracontroller.h"
+#include "core/i18n.h"
+#include "engine.h"
+#include "engineconfig.h"
+#include "ghostmanager.h"
+#include "hid/inputhandler.h"
+#include "levelloopresult.h"
+#include "menu/menudisplay.h"
+#include "objects/laraobject.h"
+#include "player.h"
+#include "presenter.h"
+#include "render/material/materialmanager.h"
+#include "render/scene/rendercontext.h"
+#include "render/scene/translucency.h"
+#include "soundeffects_tr1.h"
+#include "ui/core.h"
+#include "ui/ui.h"
+#include "util/datetime.h"
+#include "world/world.h"
+
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/log/trivial.hpp>
+
+namespace engine
+{
+namespace
+{
+void constructAmmoWidget(ui::Ui& ui,
+                         const ui::TRFont& trFont,
+                         const world::World& world,
+                         core::Tick& ammoDisplayDuration)
+{
+  if(const auto handStatus = world.getObjectManager().getLara().getHandStatus();
+     handStatus != objects::HandStatus::Combat)
+  {
+    ammoDisplayDuration = 0_tick;
+  }
+  else
+  {
+    static constexpr auto StaticDuration = core::LogicRate * 1_sec * 2 / 3;
+    static constexpr auto TransitionDuration = core::LogicRate * 1_sec / 2;
+
+    ammoDisplayDuration = std::min(ammoDisplayDuration + 1_tick, StaticDuration + TransitionDuration);
+
+    auto drawAmmoText = [&ui, &world, &trFont](const float animFactor)
+    {
+      const auto& ammo = world.getPlayer().getInventory().getAmmo(world.getPlayer().selectedWeaponType);
+      const auto text = ui::Text{ui::makeAmmoString(ammo.getDisplayString())};
+      const auto margin = ui::FontHeight / 2 + glm::mix(ui::FontHeight, 0, animFactor);
+      const auto targetPos
+        = glm::ivec2{ui.getSize().x - ui::FontHeight - 1 - margin - text.getWidth(), ui::FontHeight * 2 + margin};
+      const auto center = glm::ivec2{(ui.getSize().x - text.getWidth()) / 2, ui.getSize().y * 30 / 100};
+      const auto pos = glm::mix(center, targetPos, animFactor);
+      drawBox(text, ui, pos, margin, gl::SRGBA8{0, 0, 0, glm::mix(128, 224, animFactor)});
+      text.draw(ui, trFont, pos, 1, glm::mix(0.75f, 1.0f, animFactor));
+    };
+
+    switch(world.getPlayer().selectedWeaponType)
+    {
+    case WeaponType::None:
+    case WeaponType::Pistols:
+      break;
+    case WeaponType::Shotgun:
+    case WeaponType::Magnums:
+    case WeaponType::Uzis:
+      drawAmmoText(glm::smoothstep(
+        0.0f,
+        1.0f,
+        std::clamp(
+          (ammoDisplayDuration - StaticDuration).cast<float>() / TransitionDuration.cast<float>(), 0.0f, 1.0f)));
+      break;
+    }
+  }
+}
+
+void constructBugReportMessage(ui::Ui& ui, const ui::TRFont& trFont)
+{
+  const auto text = ui::Text{/* translators: TR charmap encoding */ _("Bug Report Saved")};
+  const auto pos = glm::ivec2{(ui.getSize().x - text.getWidth()) / 2, ui.getSize().y / 2 - ui::FontHeight};
+  text.draw(ui, trFont, pos);
+}
+
+void constructSaveReminder(ui::Ui& ui, const ui::TRFont& trFont)
+{
+  const auto text = ui::Text{/* translators: TR charmap encoding */ _("Save Game")};
+  const auto pos = glm::ivec2{(ui.getSize().x - text.getWidth()) / 2, ui::FontHeight};
+  text.draw(ui, trFont, pos);
+}
+
+void takeBugReport(const std::filesystem::path& userDataPath, world::World& world, const Presenter& presenter)
+{
+  const auto bugReports = userDataPath / "bugreports";
+  if(!std::filesystem::is_directory(bugReports))
+  {
+    std::filesystem::create_directory(bugReports);
+  }
+
+  const auto bugReport = bugReports / util::getCurrentHumanReadableTimestamp();
+  if(!std::filesystem::is_directory(bugReport))
+  {
+    std::filesystem::create_directory(bugReport);
+  }
+
+  for(std::filesystem::directory_iterator it{userDataPath}; it != std::filesystem::directory_iterator{}; ++it)
+  {
+    BOOST_LOG_TRIVIAL(info) << it->path() << "; " << it->path().filename().string();
+    if(!it->is_regular_file() || !boost::algorithm::starts_with(it->path().filename().string(), "croftengine.")
+       || !boost::algorithm::ends_with(it->path().filename().string(), ".log"))
+      continue;
+
+    std::filesystem::copy_file(it->path(), bugReport / it->path().filename());
+  }
+
+  auto img = presenter.takeScreenshot();
+  img.savePng(bugReport / "screenshot.png", false);
+
+  world.save(bugReport / "save.yaml");
+}
+
+void makeScreenshot(const Presenter& presenter, const std::filesystem::path& userDataPath)
+{
+  auto img = presenter.takeScreenshot();
+  if(!std::filesystem::is_directory(userDataPath / "screenshots"))
+    std::filesystem::create_directories(userDataPath / "screenshots");
+
+  const auto filename = util::getCurrentHumanReadableTimestamp() + ".png";
+  img.savePng(userDataPath / "screenshots" / filename, false);
+}
+} // namespace
+
+LevelLoop::LevelLoop(gslu::nn_shared<Presenter> presenter, const std::filesystem::path& userDataPath) noexcept
+    : m_presenter{std::move(presenter)}
+    , m_userDataPath{userDataPath}
+{
+}
+
+void LevelLoop::genericPreTick(world::World& world)
+{
+  m_presenter->getInputHandler().update();
+
+  if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::BugReport))
+  {
+    takeBugReport(m_userDataPath, world, *m_presenter);
+    m_bugReportSavedDuration = core::LogicRate * 5_sec;
+  }
+
+  if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Screenshot))
+  {
+    makeScreenshot(*m_presenter, m_userDataPath);
+  }
+}
+
+void LevelLoop::genericPostTick()
+{
+  if(m_runtime < BlendInDuration)
+    m_runtime += 1_tick;
+
+  if(m_bugReportSavedDuration != 0_tick)
+    m_bugReportSavedDuration -= 1_tick;
+}
+
+void LevelLoop::tickGameLogic(world::World& world)
+{
+  genericPreTick(world);
+
+  if(menu != nullptr)
+  {
+    // Update camera's previous state to match current so interpolation doesn't jiggle
+    world.getCameraController().updateGameLogic(true);
+    menu->tick(world);
+  }
+
+  genericPostTick();
+}
+
+bool LevelLoop::tickCinematicLogic(world::World& world)
+{
+  genericPreTick(world);
+
+  if(!world.tickCinematic())
+    return false;
+
+  world.updateLogicWorldState(false);
+
+  genericPostTick();
+  return true;
+}
+
+void LevelLoop::renderGame(world::World& world,
+                           const std::optional<std::chrono::steady_clock::time_point>& saveReminderNext,
+                           ui::Ui& ui)
+{
+  if(menu != nullptr)
+  {
+    const auto override = m_presenter->getRenderSystem().getMaterialManager().overrideInterTickFactor();
+    m_presenter->renderWorldGeometryFramebuffers(
+      world.getRooms(), world.getCameraController(), world.getCameraController().traceWaterSurfacePortals(), world);
+  }
+  else
+  {
+    m_presenter->renderWorldGeometryFramebuffers(
+      world.getRooms(), world.getCameraController(), world.getCameraController().traceWaterSurfacePortals(), world);
+  }
+
+  if(menu != nullptr)
+  {
+    ui::Ui menuBackground{m_presenter->getRenderSystem().getMaterialManager().getUi(),
+                          world.getWorldGeometry().getPalette(),
+                          m_presenter->getUiViewport()};
+    menuBackground.drawBox({0, 0}, ui.getSize(), gl::SRGBA8{0, 0, 0, ui::DefaultBackgroundAlpha});
+    m_presenter->renderUiToBackbuffer(menuBackground, 1);
+
+    menu->constructUi(ui, world);
+    menu->renderObjectsToFramebuffer(world);
+    m_presenter->inBackbuffer(
+      [this, &world]
+      {
+        const render::scene::RenderContext context{
+          render::material::RenderMode::FullOpaque, std::nullopt, render::scene::Translucency::Opaque};
+        menu->renderFramebuffer(world);
+      });
+  }
+  else
+  {
+    constructAmmoWidget(ui, m_presenter->getTrFont(), world, m_ammoDisplayDuration);
+    if(m_bugReportSavedDuration != 0_tick)
+    {
+      constructBugReportMessage(ui, m_presenter->getTrFont());
+    }
+
+    if(saveReminderNext.has_value() && std::chrono::steady_clock::now() >= *saveReminderNext)
+    {
+      constructSaveReminder(ui, m_presenter->getTrFont());
+    }
+
+    m_presenter->constructBars(ui,
+                               world.getWorldGeometry().getPalette(),
+                               world.getObjectManager(),
+                               world.getEngine().getEngineConfig()->pulseLowHealthHealthBar);
+
+    world.constructPickupWidgets(ui);
+  }
+}
+
+void LevelLoop::render(world::World& world,
+                       const bool isCutscene,
+                       const float interTickFactor,
+                       const std::optional<std::chrono::steady_clock::time_point>& saveReminderNext)
+{
+  ui::Ui ui{m_presenter->getRenderSystem().getMaterialManager().getUi(),
+            world.getWorldGeometry().getPalette(),
+            m_presenter->getUiViewport()};
+
+  // When menu is open, freeze object transforms but keep camera interpolating
+  const float objectInterTickFactor = (menu != nullptr) ? 0.0f : interTickFactor;
+
+  world.getCameraController().interpolateCameraTransform(interTickFactor);
+  world.getObjectManager().interpolateTransforms(objectInterTickFactor);
+
+  if(const auto lara = world.getObjectManager().getLaraPtr())
+    lara->m_state.location.room->node->setVisible(true);
+
+  if(isCutscene)
+  {
+    world.renderCinematic();
+  }
+  else
+  {
+    renderGame(world, saveReminderNext, ui);
+  }
+
+  if(const float blackAlpha
+     = m_runtime < BlendInDuration ? 1.0f - (m_runtime.cast<float>() / BlendInDuration.cast<float>()) : 0.0f;
+     blackAlpha > 0)
+  {
+    ui.drawBox({0, 0}, ui.getSize(), gl::SRGBA8{0, 0, 0, gsl_lite::narrow_cast<uint8_t>(255 * blackAlpha)});
+  }
+
+  m_presenter->renderUiToBackbuffer(ui, 1);
+  m_presenter->swapBuffers();
+}
+
+std::optional<std::pair<LevelLoopResult, std::optional<size_t>>> LevelLoop::getMenuResultAsGameLoopResult(
+  world::World& world,
+  GhostManager& ghostManager,
+  const bool ghostEnabled,
+  const bool noLoads,
+  const std::function<std::optional<SavegameMeta>(const std::optional<size_t>&)>& getSavegameMeta)
+{
+  gsl_Assert(menu != nullptr);
+
+  switch(menu->result)
+  {
+  case menu::MenuResult::None:
+    break;
+  case menu::MenuResult::Closed:
+    menu.reset();
+    break;
+  case menu::MenuResult::ExitToTitle:
+    if(ghostEnabled)
+      ghostManager.askGhostSave(*m_presenter, world);
+    return std::pair{LevelLoopResult::TitleLevel, std::nullopt};
+  case menu::MenuResult::ExitGame:
+    if(ghostEnabled)
+      ghostManager.askGhostSave(*m_presenter, world);
+    return std::pair{LevelLoopResult::ExitGame, std::nullopt};
+  case menu::MenuResult::NewGame:
+    BOOST_THROW_EXCEPTION(std::runtime_error("unexpected menu result"));
+  case menu::MenuResult::RestartLevel:
+    if(ghostEnabled)
+      ghostManager.askGhostSave(*m_presenter, world);
+    return std::pair{LevelLoopResult::RestartLevel, std::nullopt};
+  case menu::MenuResult::LaraHome:
+    BOOST_THROW_EXCEPTION(std::runtime_error("unexpected menu result"));
+  case menu::MenuResult::RequestLoad:
+    if(getSavegameMeta(menu->requestLoad).has_value())
+    {
+      if(ghostEnabled)
+        ghostManager.askGhostSave(*m_presenter, world);
+      return std::pair{LevelLoopResult::RequestLoad, menu->requestLoad};
+    }
+    break;
+  case menu::MenuResult::RequestLevel:
+    BOOST_THROW_EXCEPTION(std::runtime_error("unexpected menu result"));
+  }
+
+  if(m_presenter->getInputHandler().hasDebouncedAction(hid::Action::Load))
+  {
+    if(noLoads)
+    {
+      if(auto lara = world.getObjectManager().getLaraPtr(); lara != nullptr)
+      {
+        lara->playSoundEffect(TR1SoundEffect::LaraNo);
+      }
+    }
+    else if(getSavegameMeta(std::nullopt).has_value())
+    {
+      return std::pair{LevelLoopResult::RequestLoad, std::nullopt};
+    }
+  }
+
+  return std::nullopt;
+}
+
+bool LevelLoop::handleLaraDead(Presenter& presenter, world::World& world)
+{
+  world.getAudioEngine().setMusicGain(0);
+  m_laraDeadTime += 1_tick;
+  if(m_laraDeadTime < core::LogicRate * 10_sec
+     && (m_laraDeadTime < core::LogicRate * 2_sec || !presenter.getInputHandler().hasAnyAction()))
+  {
+    return false;
+  }
+
+  menu = std::make_shared<menu::MenuDisplay>(
+    menu::InventoryMode::DeathMode, menu::SaveGamePageMode::Restart, false, world, presenter.getRenderViewport());
+  presenter.getInputHandler().update();
+  return true;
+}
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/levelloop.h b/src/engine/levelloop.h
new file mode 100644
index 000000000..f1a3bb1af
--- /dev/null
+++ b/src/engine/levelloop.h
@@ -0,0 +1,72 @@
+#pragma once
+
+#include "core/magic.h"
+#include "core/units.h"
+#include "gslu.h"
+#include "throttler.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <filesystem>
+#include <functional>
+#include <optional>
+#include <utility>
+
+namespace ui
+{
+class Ui;
+}
+namespace engine::world
+{
+class World;
+}
+
+namespace menu
+{
+struct MenuDisplay;
+}
+
+namespace engine
+{
+struct SavegameMeta;
+class GhostManager;
+enum class LevelLoopResult : uint8_t;
+class Presenter;
+
+struct LevelLoop
+{
+  static constexpr auto BlendInDuration = core::LogicRate * 2_sec;
+  std::shared_ptr<menu::MenuDisplay> menu;
+
+  explicit LevelLoop(gslu::nn_shared<Presenter> presenter, const std::filesystem::path& userDataPath) noexcept;
+
+  void tickGameLogic(world::World& world);
+  bool tickCinematicLogic(world::World& world);
+
+  void render(world::World& world,
+              bool isCutscene,
+              float interTickFactor,
+              const std::optional<std::chrono::steady_clock::time_point>& saveReminderNext);
+  std::optional<std::pair<LevelLoopResult, std::optional<size_t>>> getMenuResultAsGameLoopResult(
+    world::World& world,
+    GhostManager& ghostManager,
+    bool ghostEnabled,
+    bool noLoads,
+    const std::function<std::optional<SavegameMeta>(const std::optional<size_t>&)>& getSavegameMeta);
+  bool handleLaraDead(Presenter& presenter, world::World& world);
+
+private:
+  void renderGame(world::World& world,
+                  const std::optional<std::chrono::steady_clock::time_point>& saveReminderNext,
+                  ui::Ui& ui);
+  void genericPreTick(world::World& world);
+  void genericPostTick();
+
+  gslu::nn_shared<Presenter> m_presenter;
+  std::filesystem::path m_userDataPath;
+  core::Tick m_runtime = 0_tick;
+  core::Tick m_laraDeadTime = 0_tick;
+  core::Tick m_ammoDisplayDuration = 0_tick;
+  core::Tick m_bugReportSavedDuration = 0_tick;
+};
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/levelloopresult.h b/src/engine/levelloopresult.h
new file mode 100644
index 000000000..3b8d3eeb6
--- /dev/null
+++ b/src/engine/levelloopresult.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <cstdint>
+
+namespace engine
+{
+enum class LevelLoopResult : uint8_t
+{
+  /// Advance to the next level in the sequence.
+  NextLevel,
+  /// Return to the title screen.
+  TitleLevel,
+  /// Go to Lara's Home (Gym).
+  LaraHomeLevel,
+  /// Quit the application.
+  ExitGame,
+  /// Load a savegame from a slot.
+  RequestLoad,
+  /// Jump to a specific level in the sequence.
+  RequestLevel,
+  /// Restart the current level.
+  RestartLevel
+};
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/lighting.cpp b/src/engine/lighting.cpp
index 20fb2c22a..13398294d 100644
--- a/src/engine/lighting.cpp
+++ b/src/engine/lighting.cpp
@@ -8,7 +8,7 @@
 #include "render/scene/node.h"
 
 #include <gl/program.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <vector>
 
@@ -28,7 +28,7 @@ void Lighting::update(const core::Shade& shade, const world::Room& baseRoom)
     return;
   }
 
-  m_buffer = gsl::not_null{baseRoom.lightsBuffer};
+  m_buffer = gsl_lite::not_null{baseRoom.lightsBuffer};
   fadeAmbient(baseRoom.ambientShade);
 }
 
@@ -62,4 +62,4 @@ void Lighting::bind(render::scene::Node& node, const world::World& world) const
       shaderStorageBlock.bind(*m_buffer);
     });
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/lighting.h b/src/engine/lighting.h
index 286865f4a..cce7fb0ca 100644
--- a/src/engine/lighting.h
+++ b/src/engine/lighting.h
@@ -5,7 +5,7 @@
 
 #include <gl/buffer.h>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <limits>
 #include <memory>
@@ -44,15 +44,16 @@ struct ShaderLight
   static gslu::nn_shared<gl::ShaderStorageBuffer<ShaderLight>> getEmptyBuffer()
   {
     static std::weak_ptr<gl::ShaderStorageBuffer<ShaderLight>> instance;
-    if(auto tmp = instance.lock())
-      return gsl::not_null{tmp};
+    if(const auto tmp = instance.lock())
+      return gsl_lite::not_null{tmp};
 
-    auto tmp = gsl::make_shared<gl::ShaderStorageBuffer<ShaderLight>>(
-      "empty-lights-buffer", gl::api::BufferUsage::StaticDraw, gsl::span<ShaderLight>{});
+    auto tmp = gsl_lite::make_shared<gl::ShaderStorageBuffer<ShaderLight>>(
+      "empty-lights-buffer", gl::api::BufferUsage::StaticDraw, gsl_lite::span<ShaderLight>{});
     instance = tmp.get();
     return tmp;
   }
 };
+
 static_assert(sizeof(ShaderLight) == 48, "Invalid Light struct size");
 
 struct Lighting
@@ -77,4 +78,4 @@ struct Lighting
 
   gslu::nn_shared<gl::ShaderStorageBuffer<ShaderLight>> m_buffer{ShaderLight::getEmptyBuffer()};
 };
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/location.cpp b/src/engine/location.cpp
index 663df049b..a9376b9be 100644
--- a/src/engine/location.cpp
+++ b/src/engine/location.cpp
@@ -11,7 +11,7 @@
 #include "world/sector.h"
 
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <ostream>
 
@@ -32,10 +32,10 @@ Location Location::create(const serialization::Deserializer<world::World>& ser)
   const world::Room* room = nullptr;
   core::TRVec position{};
   ser(S_NV_VECTOR_ELEMENT("room", std::cref(ser.context->getRooms()), std::ref(room)), S_NV("position", position));
-  return Location{gsl::not_null{room}, position};
+  return Location{gsl_lite::not_null{room}, position};
 }
 
-gsl::not_null<const world::Sector*> Location::updateRoom()
+gsl_lite::not_null<const world::Sector*> Location::updateRoom()
 {
   const world::Sector* sector;
   while(true)
@@ -47,7 +47,7 @@ gsl::not_null<const world::Sector*> Location::updateRoom()
       break;
     }
 
-    room = gsl::not_null{sector->boundaryRoom};
+    room = gsl_lite::not_null{sector->boundaryRoom};
   }
 
   // go up/down until we are in the room that contains our coordinates
@@ -56,7 +56,7 @@ gsl::not_null<const world::Sector*> Location::updateRoom()
   {
     while(position.Y >= sector->floorHeight && sector->roomBelow != nullptr)
     {
-      room = gsl::not_null{sector->roomBelow};
+      room = gsl_lite::not_null{sector->roomBelow};
       sector = room->getSectorByAbsolutePosition(position);
       gsl_Assert(sector != nullptr);
     }
@@ -65,13 +65,13 @@ gsl::not_null<const world::Sector*> Location::updateRoom()
   {
     while(position.Y < sector->ceilingHeight && sector->roomAbove != nullptr)
     {
-      room = gsl::not_null{sector->roomAbove};
+      room = gsl_lite::not_null{sector->roomAbove};
       sector = room->getSectorByAbsolutePosition(position);
       gsl_Assert(sector != nullptr);
     }
   }
 
-  return gsl::not_null{sector};
+  return gsl_lite::not_null{sector};
 }
 
 bool Location::isValid() const
@@ -88,4 +88,4 @@ std::ostream& operator<<(std::ostream& stream, const Location& rhs)
 {
   return stream << "[" << rhs.room->node->getName() << " " << rhs.position << "]";
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/location.h b/src/engine/location.h
index 47f0eaa89..c013245a1 100644
--- a/src/engine/location.h
+++ b/src/engine/location.h
@@ -5,7 +5,7 @@
 #include "serialization/serialization_fwd.h"
 
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iosfwd>
 #include <utility>
 
@@ -20,11 +20,11 @@ namespace engine
 {
 struct Location final
 {
-  gsl::not_null<const world::Room*> room;
+  gsl_lite::not_null<const world::Room*> room;
 
   core::TRVec position;
 
-  explicit Location(gsl::not_null<const world::Room*> r, core::TRVec pos = {}) noexcept
+  explicit Location(gsl_lite::not_null<const world::Room*> r, core::TRVec pos = {}) noexcept
       : room{std::move(r)}
       , position{std::move(pos)}
   {
@@ -34,7 +34,7 @@ struct Location final
   void deserialize(const serialization::Deserializer<world::World>& ser);
   [[nodiscard]] static Location create(const serialization::Deserializer<world::World>& ser);
 
-  gsl::not_null<const world::Sector*> updateRoom();
+  gsl_lite::not_null<const world::Sector*> updateRoom();
 
   [[nodiscard]] auto moved(const core::TRVec& d) const
   {
@@ -69,4 +69,4 @@ struct Location final
 };
 
 extern std::ostream& operator<<(std::ostream& stream, const Location& rhs);
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/objectmanager.cpp b/src/engine/objectmanager.cpp
index aa9d7d146..3731c0d16 100644
--- a/src/engine/objectmanager.cpp
+++ b/src/engine/objectmanager.cpp
@@ -10,6 +10,7 @@
 #include "objects/objectfactory.h"
 #include "objects/objectstate.h"
 #include "objects/pickupobject.h"
+#include "particle.h"
 #include "particlecollection.h"
 #include "render/scene/node.h"
 #include "serialization/map.h"
@@ -17,20 +18,21 @@
 #include "serialization/objectreference.h" // IWYU pragma: keep
 #include "serialization/serialization.h"
 #include "serialization/vector.h"
+#include "skeletalmodelnode.h"
 #include "world/room.h"
 #include "world/sprite.h"
 #include "world/world.h"
 
 #include <algorithm>
 #include <boost/range/adaptor/indexed.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <boost/throw_exception.hpp>
 #include <cstdint>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <limits>
 #include <memory>
+#include <ranges>
 #include <stdexcept>
 #include <utility>
 #include <vector>
@@ -40,7 +42,7 @@ namespace engine
 void ObjectManager::createObjects(world::World& world, std::vector<loader::file::Item>& items)
 {
   gsl_Expects(m_objectCounter == 0);
-  m_objectCounter = gsl::narrow<ObjectId>(items.size());
+  m_objectCounter = gsl_lite::narrow<ObjectId>(items.size());
 
   m_lara = nullptr;
   for(const auto& idItem : items | boost::adaptors::indexed())
@@ -60,7 +62,7 @@ void ObjectManager::createObjects(world::World& world, std::vector<loader::file:
     if(object == nullptr)
       continue;
 
-    m_objects.emplace(gsl::narrow<ObjectId>(idItem.index()), object);
+    m_objects.emplace(gsl_lite::narrow<ObjectId>(idItem.index()), object);
     if(object->isActive())
     {
       object->activate();
@@ -77,24 +79,22 @@ void ObjectManager::applyScheduledDeletions()
   {
     deactivate(del);
 
-    if(auto it = std::find_if(m_dynamicObjects.begin(),
-                              m_dynamicObjects.end(),
-                              [del](const std::shared_ptr<objects::Object>& i) noexcept
-                              {
-                                return i.get() == del;
-                              });
+    if(auto it = std::ranges::find_if(m_dynamicObjects,
+                                      [del](const std::shared_ptr<objects::Object>& i) noexcept
+                                      {
+                                        return i.get() == del;
+                                      });
        it != m_dynamicObjects.end())
     {
       m_dynamicObjects.erase(it);
       continue;
     }
 
-    if(auto it = std::find_if(m_objects.begin(),
-                              m_objects.end(),
-                              [del](const std::pair<uint16_t, gslu::nn_shared<objects::Object>>& i)
-                              {
-                                return i.second.get().get() == del;
-                              });
+    if(auto it = std::ranges::find_if(m_objects,
+                                      [del](const std::pair<uint16_t, gslu::nn_shared<objects::Object>>& i)
+                                      {
+                                        return i.second.get().get() == del;
+                                      });
        it != m_objects.end())
     {
       m_objects.erase(it);
@@ -113,29 +113,28 @@ void ObjectManager::registerObject(const gslu::nn_shared<objects::Object>& objec
   m_objects.emplace(m_objectCounter++, object);
 }
 
-std::shared_ptr<objects::Object> ObjectManager::find(const objects::Object* object, bool includeDynamicObjects) const
+std::shared_ptr<objects::Object> ObjectManager::find(const objects::Object* object,
+                                                     const bool includeDynamicObjects) const
 {
   if(object == nullptr)
     return nullptr;
 
-  auto it = std::find_if(m_objects.begin(),
-                         m_objects.end(),
-                         [object](const std::pair<uint16_t, gslu::nn_shared<objects::Object>>& x)
-                         {
-                           return x.second.get().get() == object;
-                         });
+  const auto it = std::ranges::find_if(m_objects,
+                                       [object](const std::pair<uint16_t, gslu::nn_shared<objects::Object>>& x)
+                                       {
+                                         return x.second.get().get() == object;
+                                       });
 
   if(it != m_objects.end())
     return it->second;
 
   if(includeDynamicObjects)
   {
-    auto it2 = std::find_if(m_dynamicObjects.begin(),
-                            m_dynamicObjects.end(),
-                            [object](const auto& x)
-                            {
-                              return x.get().get() == object;
-                            });
+    const auto it2 = std::ranges::find_if(m_dynamicObjects,
+                                          [object](const auto& x)
+                                          {
+                                            return x.get().get() == object;
+                                          });
     if(it2 != m_dynamicObjects.end())
       return *it2;
   }
@@ -143,7 +142,7 @@ std::shared_ptr<objects::Object> ObjectManager::find(const objects::Object* obje
   return nullptr;
 }
 
-std::shared_ptr<objects::Object> ObjectManager::getObject(ObjectId id) const
+std::shared_ptr<objects::Object> ObjectManager::getObject(const ObjectId id) const
 {
   const auto it = m_objects.find(id);
   if(it == m_objects.end())
@@ -152,7 +151,7 @@ std::shared_ptr<objects::Object> ObjectManager::getObject(ObjectId id) const
   return it->second.get();
 }
 
-void ObjectManager::update(world::World& world, bool godMode)
+void ObjectManager::updateLogic(world::World& world, const bool godMode)
 {
   for(const auto& object : m_dynamicObjects)
   {
@@ -160,18 +159,23 @@ void ObjectManager::update(world::World& world, bool godMode)
     object->updateLighting();
   }
 
-  for(const auto& object : m_objects | boost::adaptors::map_values)
+  for(const auto& object : m_objects | std::views::values)
   {
     object->getNode()->setVisible(object->m_state.triggerState != objects::TriggerState::Invisible);
     object->updateLighting();
   }
 
-  const auto activeObjects = m_activeObjects; // need to work on a copy because update() may modify the collection
-  for(const auto& object : activeObjects)
+  // need to work on a copy because updateLogic() may modify the collection
+  for(const auto activeObjects = m_activeObjects; const auto& object : activeObjects)
   {
     if(object.get() == m_lara) // Lara is special and needs to be updated last
       continue;
-    object->update();
+    object->updateLogic();
+    if(const auto modelObject = std::dynamic_pointer_cast<objects::ModelObject>(object.get());
+       modelObject != nullptr && modelObject->getSkeleton() != nullptr)
+    {
+      modelObject->getSkeleton()->updateSmoothMatrices();
+    }
   }
 
   m_particles.update(world);
@@ -184,7 +188,8 @@ void ObjectManager::update(world::World& world, bool godMode)
   {
     if(godMode && !m_lara->isDead())
       m_lara->m_state.health = core::LaraHealth;
-    m_lara->update();
+    m_lara->updateLogic();
+    m_lara->getSkeleton()->updateSmoothMatrices();
     m_lara->updateLighting();
   }
 
@@ -200,12 +205,11 @@ void ObjectManager::serialize(const serialization::Serializer<world::World>& ser
   std::vector<ObjectId> activeObjectIds;
   for(const auto& obj : m_activeObjects)
   {
-    auto it = std::find_if(m_objects.begin(),
-                           m_objects.end(),
-                           [obj](const auto& i)
-                           {
-                             return i.second.get() == obj;
-                           });
+    auto it = std::ranges::find_if(m_objects,
+                                   [obj](const auto& i)
+                                   {
+                                     return i.second.get() == obj;
+                                   });
     if(it != m_objects.end())
     {
       activeObjectIds.emplace_back(it->first);
@@ -232,33 +236,49 @@ void ObjectManager::deserialize(const serialization::Deserializer<world::World>&
 // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
 void ObjectManager::replaceItems(const TR1ItemId& oldId, const TR1ItemId& newId, const world::World& world)
 {
-  for(const auto& [_, obj] : m_objects)
+  for(const auto& obj : m_objects | std::views::values)
   {
     if(obj->m_state.type != oldId)
       continue;
 
-    const gsl::not_null pickup{std::dynamic_pointer_cast<objects::PickupObject>(obj.get())};
+    const gsl_lite::not_null pickup{std::dynamic_pointer_cast<objects::PickupObject>(obj.get())};
     const auto& spriteSequence = world.getWorldGeometry().findSpriteSequenceForType(newId);
     gsl_Assert(spriteSequence != nullptr && !spriteSequence->sprites.empty());
-    pickup->replace(newId, gsl::not_null{spriteSequence->sprites.data()});
+    pickup->replace(newId, gsl_lite::not_null{spriteSequence->sprites.data()});
   }
 }
 
-void ObjectManager::deactivate(const engine::objects::Object* object)
+void ObjectManager::deactivate(const objects::Object* object)
 {
-  if(auto it = std::find_if(m_activeObjects.begin(),
-                            m_activeObjects.end(),
-                            [object](const auto& i)
-                            {
-                              return i.get().get() == object;
-                            });
+  if(const auto it = std::ranges::find_if(m_activeObjects,
+                                          [object](const auto& i)
+                                          {
+                                            return i.get().get() == object;
+                                          });
      it != m_activeObjects.end())
   {
     m_activeObjects.erase(it);
   }
 }
+void ObjectManager::interpolateTransforms(const float interTickFactor)
+{
+  for(const auto& object : m_objects | std::views::values)
+  {
+    object->interpolateTransform(interTickFactor);
+  }
+
+  for(const auto& object : m_dynamicObjects)
+  {
+    object->interpolateTransform(interTickFactor);
+  }
+
+  for(const auto& particle : m_particles)
+  {
+    particle->interpolateTransform(interTickFactor);
+  }
+}
 
-void ObjectManager::activate(const engine::objects::Object* object)
+void ObjectManager::activate(const objects::Object* object)
 {
   const auto ob = find(object, true);
   if(ob == nullptr)
@@ -266,10 +286,9 @@ void ObjectManager::activate(const engine::objects::Object* object)
     return;
   }
 
-  const auto it = std::find(m_activeObjects.begin(), m_activeObjects.end(), gsl::not_null{ob});
-  if(it == m_activeObjects.end())
+  if(const auto it = std::ranges::find(m_activeObjects, gsl_lite::not_null{ob}); it == m_activeObjects.end())
   {
     m_activeObjects.emplace_front(ob);
   }
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/objectmanager.h b/src/engine/objectmanager.h
index 85fe75b24..257d89663 100644
--- a/src/engine/objectmanager.h
+++ b/src/engine/objectmanager.h
@@ -4,7 +4,7 @@
 #include "serialization/serialization_fwd.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <list>
 #include <map>
@@ -119,19 +119,23 @@ class ObjectManager
   std::shared_ptr<objects::Object> find(const objects::Object* object, bool includeDynamicObjects = false) const;
   void createObjects(world::World& world, std::vector<loader::file::Item>& items);
   [[nodiscard]] std::shared_ptr<objects::Object> getObject(ObjectId id) const;
+
   [[nodiscard]] auto getObjectCounter() const noexcept
   {
     return m_objectCounter;
   }
-  void update(world::World& world, bool godMode);
+
+  void updateLogic(world::World& world, bool godMode);
 
   void replaceItems(const TR1ItemId& oldId, const TR1ItemId& newId, const world::World& world);
 
   void serialize(const serialization::Serializer<world::World>& ser) const;
   void deserialize(const serialization::Deserializer<world::World>& ser);
 
-  void activate(const engine::objects::Object* object);
+  void activate(const objects::Object* object);
+
+  void deactivate(const objects::Object* object);
 
-  void deactivate(const engine::objects::Object* object);
+  void interpolateTransforms(float interTickFactor);
 };
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/objects/aiagent.cpp b/src/engine/objects/aiagent.cpp
index 8af409881..85c1a6583 100644
--- a/src/engine/objects/aiagent.cpp
+++ b/src/engine/objects/aiagent.cpp
@@ -35,13 +35,13 @@
 #include <algorithm>
 #include <boost/assert.hpp>
 #include <boost/log/trivial.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <cstddef>
 #include <cstdint>
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <map>
 #include <memory>
+#include <ranges>
 #include <string>
 
 namespace engine::objects
@@ -55,7 +55,7 @@ bool canMoveTo(const world::Room& room,
                const core::Length& nextPathFloor,
                const core::TRVec& testPos)
 {
-  const auto testBox = Location{gsl::not_null{&room}, testPos}.updateRoom()->box;
+  const auto testBox = Location{gsl_lite::not_null{&room}, testPos}.updateRoom()->box;
   if(testBox == nullptr || !pathFinder.canVisit(*testBox, currentBox.blocked, currentBox.blockable))
   {
     return false;
@@ -99,8 +99,8 @@ core::Angle AIAgent::rotateTowardsTarget(core::RotationSpeed maxRotationSpeed)
   if(abs(turnAngle) > 90_deg)
   {
     // the target is behind the current object, so we need a U-turn
-    const auto relativeSpeed = m_state.speed.cast<float>() * 90_deg / maxRotationSpeed;
-    if(util::square(dx) + util::square(dz) < util::square(relativeSpeed))
+    if(const auto relativeSpeed = m_state.speed.cast<float>() * 90_deg / maxRotationSpeed;
+       util::square(dx) + util::square(dz) < util::square(relativeSpeed))
     {
       maxRotationSpeed /= 2;
     }
@@ -114,7 +114,7 @@ core::Angle AIAgent::rotateTowardsTarget(core::RotationSpeed maxRotationSpeed)
 
 bool AIAgent::anyMovingEnabledObjectInReach() const
 {
-  for(const auto& object : getWorld().getObjectManager().getObjects() | boost::adaptors::map_values)
+  for(const auto& object : getWorld().getObjectManager().getObjects() | std::views::values)
   {
     if(object.get().get() == this)
       break;
@@ -136,8 +136,8 @@ void AIAgent::animateCreature(const core::Angle& moveRotationY, const core::Angl
   if(m_creatureInfo == nullptr)
     return;
 
-  const auto invariantCheck = gsl::finally(
-    [this]()
+  const auto invariantCheck = gsl_lite::finally(
+    [this]
     {
       gsl_Assert(m_state.location.isValid());
 
@@ -148,18 +148,18 @@ void AIAgent::animateCreature(const core::Angle& moveRotationY, const core::Angl
   const auto& pathFinder = m_creatureInfo->pathFinder;
 
   const auto oldLocation = m_state.location;
-  const auto oldBox = gsl::not_null{oldLocation.getCurrentSector()->box};
+  const auto oldBox = gsl_lite::not_null{oldLocation.getCurrentSector()->box};
 
 #ifndef NDEBUG
-  const auto invariantCheck2 = gsl::finally(
-    [this, oldPos = m_state.location.position]()
+  const auto invariantCheck2 = gsl_lite::finally(
+    [this, oldPos = m_state.location.position]
     {
       gsl_Assert(abs(m_state.location.position.Y - oldPos.Y) < 2_sectors);
     });
 #endif
 
   // this can move the entity into an invalid position
-  ModelObject::update();
+  advanceFrame();
 
   // Moving to a different sector is basically a wall glitch, as the collision check always moves the entity away
   // from the sector boundaries if it detects a collision. As the max norm is always greater than or equal to the
@@ -192,7 +192,7 @@ void AIAgent::animateCreature(const core::Angle& moveRotationY, const core::Angl
   gsl_Assert(currentSector->box != nullptr);
 
   core::Length nextPathFloor;
-  if(const auto& exitBox = pathFinder.getNextPathBox(gsl::not_null{currentSector->box}); exitBox != nullptr)
+  if(const auto& exitBox = pathFinder.getNextPathBox(gsl_lite::not_null{currentSector->box}); exitBox != nullptr)
   {
     nextPathFloor = exitBox->floor;
   }
@@ -220,7 +220,7 @@ void AIAgent::animateCreature(const core::Angle& moveRotationY, const core::Angl
   {
     return canMoveTo(*m_state.location.room,
                      m_creatureInfo->pathFinder,
-                     *gsl::not_null{currentSector->box},
+                     *gsl_lite::not_null{currentSector->box},
                      currentSector->box->floor,
                      nextPathFloor,
                      position);
@@ -387,10 +387,10 @@ void AIAgent::animateCreature(const core::Angle& moveRotationY, const core::Angl
 }
 
 AIAgent::AIAgent(const std::string& name,
-                 const gsl::not_null<world::World*>& world,
-                 const gsl::not_null<const world::Room*>& room,
+                 const gsl_lite::not_null<world::World*>& world,
+                 const gsl_lite::not_null<const world::Room*>& room,
                  const loader::file::Item& item,
-                 const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                 const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, true}
 {
   m_state.collidable = true;
@@ -433,7 +433,7 @@ bool AIAgent::canShootAtLara(const ai::EnemyLocation& enemyLocation) const
 bool AIAgent::tryShootAtLara(ModelObject& object,
                              const core::Area& distance,
                              const core::TRVec& bonePos,
-                             size_t boneIndex,
+                             const size_t boneIndex,
                              const core::Angle& muzzleFlashAngle)
 {
   auto& lara = getWorld().getObjectManager().getLara();
@@ -462,13 +462,13 @@ bool AIAgent::tryShootAtLara(ModelObject& object,
     lara.emitRicochet(location);
   }
 
-  auto p = object.emitParticle(bonePos, boneIndex, &createMuzzleFlash);
+  const auto p = object.emitParticle(bonePos, boneIndex, &createMuzzleFlash);
   p->angle.Y += muzzleFlashAngle;
 
   return isHit;
 }
 
-void AIAgent::loadObjectInfo(bool withoutGameState)
+void AIAgent::loadObjectInfo(const bool withoutGameState)
 {
   m_collisionRadius = core::Length{getWorld()
                                      .getEngine()
@@ -548,14 +548,14 @@ void AIAgent::finalWalkingAnimation()
 
   m_state.rotation.X = 0_au;
 
-  auto currentSector = m_state.location.updateRoom();
+  const auto currentSector = m_state.location.updateRoom();
   BOOST_ASSERT(m_state.location.isValid());
   setCurrentRoom(m_state.location.room);
   m_state.floor
     = HeightInfo::fromFloor(currentSector, m_state.location.position, getWorld().getObjectManager().getObjects()).y;
 }
 
-void AIAgent::finalFlyingAnimation(const gsl::not_null<const world::Sector*>& currentSector,
+void AIAgent::finalFlyingAnimation(const gsl_lite::not_null<const world::Sector*>& currentSector,
                                    const core::BoundingBox& bbox,
                                    const Location& oldLocation)
 {
@@ -595,9 +595,8 @@ void AIAgent::finalFlyingAnimation(const gsl::not_null<const world::Sector*>& cu
           .y;
 
     // TODO nah... why, core, why?
-    const auto bboxTopAdjusted = m_state.type == TR1ItemId::CrocodileInWater ? 0_len : bbox.y.min;
-
-    if(m_state.location.position.Y + bboxTopAdjusted + moveY < currentCeiling)
+    if(const auto bboxTopAdjusted = m_state.type == TR1ItemId::CrocodileInWater ? 0_len : bbox.y.min;
+       m_state.location.position.Y + bboxTopAdjusted + moveY < currentCeiling)
     {
       // fly movements ended up penetrating the ceiling
 
@@ -624,7 +623,7 @@ void AIAgent::finalFlyingAnimation(const gsl::not_null<const world::Sector*>& cu
                                         getWorld().getObjectManager().getObjects())
                     .y;
 
-  core::Angle yaw{0_deg};
+  auto yaw{0_deg};
   if(m_state.speed != 0_spd)
     yaw = angleFromAtan(-moveY, m_state.speed * 1_frame);
 
@@ -640,7 +639,7 @@ void AIAgent::finalFlyingAnimation(const gsl::not_null<const world::Sector*>& cu
   setCurrentRoom(m_state.location.room);
 }
 
-gsl::not_null<const world::Sector*>
+gsl_lite::not_null<const world::Sector*>
   AIAgent::fixInvalidPosition(const core::TRVec& oldPosition, const world::Box& oldBox, const core::BoundingBox& bbox)
 {
   auto currentSector = m_state.location.moved(0_len, bbox.y.max, 0_len).updateRoom();
@@ -667,15 +666,13 @@ gsl::not_null<const world::Sector*>
     };
 
     const auto oldSectorX = sectorOf(oldPosition.X);
-    const auto newSectorX = sectorOf(m_state.location.position.X);
-    if(newSectorX < oldSectorX)
+    if(const auto newSectorX = sectorOf(m_state.location.position.X); newSectorX < oldSectorX)
       m_state.location.position.X = toMin(oldPosition.X);
     else if(newSectorX > oldSectorX)
       m_state.location.position.X = toMax(oldPosition.X);
 
     const auto oldSectorZ = sectorOf(oldPosition.Z);
-    const auto newSectorZ = sectorOf(m_state.location.position.Z);
-    if(newSectorZ < oldSectorZ)
+    if(const auto newSectorZ = sectorOf(m_state.location.position.Z); newSectorZ < oldSectorZ)
       m_state.location.position.Z = toMin(oldPosition.Z);
     else if(newSectorZ > oldSectorZ)
       m_state.location.position.Z = toMax(oldPosition.Z);
@@ -685,4 +682,4 @@ gsl::not_null<const world::Sector*>
 
   return currentSector;
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/aiagent.h b/src/engine/objects/aiagent.h
index e0dd7d3da..c22511dc8 100644
--- a/src/engine/objects/aiagent.h
+++ b/src/engine/objects/aiagent.h
@@ -16,7 +16,7 @@
 #include <bitset>
 #include <cstddef>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 #include <string>
@@ -45,10 +45,10 @@ class AIAgent : public ModelObject
 {
 public:
   AIAgent(const std::string& name,
-          const gsl::not_null<world::World*>& world,
-          const gsl::not_null<const world::Room*>& room,
+          const gsl_lite::not_null<world::World*>& world,
+          const gsl_lite::not_null<const world::Room*>& room,
           const loader::file::Item& item,
-          const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+          const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
   void collide(CollisionInfo& collisionInfo) override;
 
@@ -67,7 +67,7 @@ class AIAgent : public ModelObject
   [[nodiscard]] bool isInsideZoneButNotInBox(uint32_t zoneId, const world::Box& targetBox) const;
 
 protected:
-  AIAgent(const gsl::not_null<world::World*>& world, const Location& location)
+  AIAgent(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
@@ -94,7 +94,7 @@ class AIAgent : public ModelObject
 
   bool canShootAtLara(const ai::EnemyLocation& enemyLocation) const;
 
-  bool tryShootAtLara(engine::objects::ModelObject& object,
+  bool tryShootAtLara(ModelObject& object,
                       const core::Area& distance,
                       const core::TRVec& bonePos,
                       size_t boneIndex,
@@ -110,7 +110,7 @@ class AIAgent : public ModelObject
     return m_state.touch_bits.any();
   }
 
-  bool touched(unsigned long bits) const noexcept
+  bool touched(const unsigned long bits) const noexcept
   {
     return (m_state.touch_bits.to_ulong() & bits) != 0;
   }
@@ -193,10 +193,10 @@ class AIAgent : public ModelObject
 private:
   bool anyMovingEnabledObjectInReach() const;
   void finalWalkingAnimation();
-  void finalFlyingAnimation(const gsl::not_null<const world::Sector*>& currentSector,
+  void finalFlyingAnimation(const gsl_lite::not_null<const world::Sector*>& currentSector,
                             const core::BoundingBox& bbox,
                             const Location& oldLocation);
-  [[nodiscard]] gsl::not_null<const world::Sector*>
+  [[nodiscard]] gsl_lite::not_null<const world::Sector*>
     fixInvalidPosition(const core::TRVec& oldPosition, const world::Box& oldBox, const core::BoundingBox& bbox);
 
   core::Length m_collisionRadius = 0_len;
@@ -204,19 +204,18 @@ class AIAgent : public ModelObject
   std::unique_ptr<ai::CreatureInfo> m_creatureInfo;
 };
 
-#define AIAGENT_DEFAULT_CONSTRUCTORS(CLASS)                                  \
-  CLASS(const gsl::not_null<world::World*>& world, const Location& location) \
-      : AIAgent{world, location}                                             \
-  {                                                                          \
-  }                                                                          \
-                                                                             \
-  CLASS(const std::string& name,                                             \
-        const gsl::not_null<world::World*>& world,                           \
-        const gsl::not_null<const world::Room*>& room,                       \
-        const loader::file::Item& item,                                      \
-        const gsl::not_null<const world::SkeletalModelType*>& animatedModel) \
-      : AIAgent{name, world, room, item, animatedModel}                      \
-  {                                                                          \
-  }
-
-} // namespace engine::objects
+#define AIAGENT_DEFAULT_CONSTRUCTORS(CLASS)                                       \
+  CLASS(const gsl_lite::not_null<world::World*>& world, const Location& location) \
+      : AIAgent{world, location}                                                  \
+  {                                                                               \
+  }                                                                               \
+                                                                                  \
+  CLASS(const std::string& name,                                                  \
+        const gsl_lite::not_null<world::World*>& world,                           \
+        const gsl_lite::not_null<const world::Room*>& room,                       \
+        const loader::file::Item& item,                                           \
+        const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel) \
+      : AIAgent{name, world, room, item, animatedModel}                           \
+  {                                                                               \
+  }
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/aiminfo.cpp b/src/engine/objects/aiminfo.cpp
index 752b47373..fe84b3685 100644
--- a/src/engine/objects/aiminfo.cpp
+++ b/src/engine/objects/aiminfo.cpp
@@ -2,6 +2,7 @@
 
 #include "core/angle.h"
 #include "core/units.h"
+#include "engine/engine.h"
 #include "engine/items_tr1.h"
 #include "engine/objects/objectstate.h"
 #include "engine/presenter.h"
@@ -22,7 +23,7 @@
 #include <boost/throw_exception.hpp>
 #include <cstdint>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <stdexcept>
 #include <vector>
@@ -32,7 +33,7 @@ namespace engine::objects
 void AimInfo::serialize(const serialization::Serializer<world::World>& ser) const
 {
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-  auto ptr = reinterpret_cast<const int16_t*>(weaponAnimData);
+  const auto ptr = reinterpret_cast<const int16_t*>(weaponAnimData);
   ser(S_NV_VECTOR_ELEMENT("weaponAnimData", std::cref(ser.context->getWorldGeometry().getPoseFrames()), std::cref(ptr)),
       S_NV("frame", frame),
       S_NV("aiming", aiming),
@@ -53,10 +54,9 @@ void AimInfo::deserialize(const serialization::Deserializer<world::World>& ser)
   weaponAnimData = reinterpret_cast<const loader::file::AnimFrame*>(ptr);
 }
 
-void AimInfo::updateAnimTwoWeapons(LaraObject& lara, const Weapon& weapon)
+void AimInfo::updateAnimTwoWeapons(LaraObject& lara, const Weapon& weapon, const hid::InputHandler& inputHandler)
 {
-  if(!aiming
-     && (lara.aimAt != nullptr || !lara.getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action)))
+  if(!aiming && (lara.aimAt != nullptr || !inputHandler.hasAction(hid::Action::Action)))
   {
     if(frame >= TwoWeaponsRecoilAnimStart)
     {
@@ -75,7 +75,7 @@ void AimInfo::updateAnimTwoWeapons(LaraObject& lara, const Weapon& weapon)
   {
     frame += 1_frame;
   }
-  else if(frame == TwoWeaponsAiming && lara.getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+  else if(frame == TwoWeaponsAiming && inputHandler.hasAction(hid::Action::Action))
   {
     core::TRRotationXY aimAngle;
     aimAngle.X = aimRotation.X;
@@ -97,7 +97,7 @@ void AimInfo::updateAnimTwoWeapons(LaraObject& lara, const Weapon& weapon)
   }
 }
 
-void AimInfo::updateAnimShotgunAiming(LaraObject& lara)
+void AimInfo::updateAnimShotgunAiming(LaraObject& lara, const hid::InputHandler& inputHandler)
 {
   if(frame >= ShotgunIdle && frame <= ShotgunIdleToAimAnimEnd)
   {
@@ -112,7 +112,7 @@ void AimInfo::updateAnimShotgunAiming(LaraObject& lara)
   }
   else if(frame == ShotgunReadyToShoot)
   {
-    if(lara.getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+    if(inputHandler.hasAction(hid::Action::Action))
     {
       lara.tryShootShotgun();
       frame += 1_frame;
@@ -147,16 +147,16 @@ void AimInfo::updateAnimShotgunAiming(LaraObject& lara)
   }
 }
 
-void AimInfo::updateAnimShotgun(LaraObject& lara)
+void AimInfo::updateAnimShotgun(LaraObject& lara, const hid::InputHandler& inputHandler)
 {
   if(aiming)
   {
-    updateAnimShotgunAiming(lara);
+    updateAnimShotgunAiming(lara, inputHandler);
 
     return;
   }
 
-  if(frame == ShotgunIdle && lara.getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+  if(frame == ShotgunIdle && inputHandler.hasAction(hid::Action::Action))
   {
     frame += 1_frame;
     return;
@@ -166,7 +166,7 @@ void AimInfo::updateAnimShotgun(LaraObject& lara)
   {
     if(frame == ShotgunIdleToAimAnimEnd)
     {
-      if(lara.getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+      if(inputHandler.hasAction(hid::Action::Action))
       {
         frame = ShotgunReadyToShoot;
       }
@@ -182,7 +182,7 @@ void AimInfo::updateAnimShotgun(LaraObject& lara)
   }
   else if(frame == ShotgunReadyToShoot)
   {
-    if(lara.getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+    if(inputHandler.hasAction(hid::Action::Action))
     {
       lara.tryShootShotgun();
       frame += 1_frame;
@@ -225,7 +225,7 @@ void AimInfo::updateAnimShotgun(LaraObject& lara)
   }
 }
 
-void AimInfo::holsterTwoWeapons(LaraObject& lara, WeaponType weaponType)
+void AimInfo::holsterTwoWeapons(LaraObject& lara, const WeaponType weaponType)
 {
   if(frame >= TwoWeaponsRecoilAnimStart)
   {
@@ -323,7 +323,7 @@ void AimInfo::holsterShotgun(LaraObject& lara)
 }
 
 // NOLINTNEXTLINE(readability-make-member-function-const)
-void AimInfo::overrideHolsterTwoWeaponsMeshes(LaraObject& lara, WeaponType weaponType)
+void AimInfo::overrideHolsterTwoWeaponsMeshes(LaraObject& lara, const WeaponType weaponType)
 {
   TR1ItemId srcId;
   switch(weaponType)
@@ -341,19 +341,19 @@ void AimInfo::overrideHolsterTwoWeaponsMeshes(LaraObject& lara, WeaponType weapo
     BOOST_THROW_EXCEPTION(std::domain_error("weaponType"));
   }
 
-  const auto& src = *gsl::not_null{lara.getWorld().getWorldGeometry().findAnimatedModelForType(srcId).get()};
+  const auto& src = *gsl_lite::not_null{lara.getWorld().getWorldGeometry().findAnimatedModelForType(srcId).get()};
   auto& laraSkeleton = *lara.getSkeleton();
   BOOST_ASSERT(src.bones.size() == laraSkeleton.getBoneCount());
   const auto& normalLara
-    = *gsl::not_null{lara.getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Lara).get()};
+    = *gsl_lite::not_null{lara.getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Lara).get()};
   BOOST_ASSERT(normalLara.bones.size() == laraSkeleton.getBoneCount());
-  laraSkeleton.setMesh(handBoneId, gsl::at(normalLara.bones, handBoneId).mesh);
-  laraSkeleton.setMesh(thighBoneId, gsl::at(src.bones, thighBoneId).mesh);
+  laraSkeleton.setMesh(handBoneId, gsl_lite::at(normalLara.bones, handBoneId).mesh);
+  laraSkeleton.setMesh(thighBoneId, gsl_lite::at(src.bones, thighBoneId).mesh);
   laraSkeleton.rebuildMesh();
 }
 
 // NOLINTNEXTLINE(readability-make-member-function-const)
-void AimInfo::overrideDrawTwoWeaponsMeshes(LaraObject& lara, WeaponType weaponType)
+void AimInfo::overrideDrawTwoWeaponsMeshes(LaraObject& lara, const WeaponType weaponType)
 {
   TR1ItemId id;
   switch(weaponType)
@@ -377,8 +377,8 @@ void AimInfo::overrideDrawTwoWeaponsMeshes(LaraObject& lara, WeaponType weaponTy
   BOOST_ASSERT(src->bones.size() == laraSkeleton.getBoneCount());
   const auto& normalLara = *lara.getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Lara);
   BOOST_ASSERT(normalLara.bones.size() == laraSkeleton.getBoneCount());
-  laraSkeleton.setMesh(handBoneId, gsl::at(src->bones, handBoneId).mesh);
-  laraSkeleton.setMesh(thighBoneId, gsl::at(normalLara.bones, thighBoneId).mesh);
+  laraSkeleton.setMesh(handBoneId, gsl_lite::at(src->bones, handBoneId).mesh);
+  laraSkeleton.setMesh(thighBoneId, gsl_lite::at(normalLara.bones, thighBoneId).mesh);
 }
 
 void AimInfo::updateAimAngles(const Weapon& weapon, const core::TRRotationXY& weaponTargetVector) noexcept
@@ -417,4 +417,4 @@ void AimInfo::updateAimAngles(const Weapon& weapon, const core::TRRotationXY& we
     aimRotation.Y += weapon.aimSpeed * 1_frame;
   }
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/aiminfo.h b/src/engine/objects/aiminfo.h
index d98bdffb7..a34f2e07a 100644
--- a/src/engine/objects/aiminfo.h
+++ b/src/engine/objects/aiminfo.h
@@ -8,6 +8,11 @@
 #include <cstddef>
 #include <limits>
 
+namespace hid
+{
+class InputHandler;
+}
+
 namespace loader::file
 {
 struct AnimFrame;
@@ -60,8 +65,8 @@ struct AimInfo
   core::TRRotationXY aimRotation{};
   core::Frame flashTimeout = 0_frame;
 
-  void updateAnimTwoWeapons(LaraObject& lara, const Weapon& weapon);
-  void updateAnimShotgun(LaraObject& lara);
+  void updateAnimTwoWeapons(LaraObject& lara, const Weapon& weapon, const hid::InputHandler& inputHandler);
+  void updateAnimShotgun(LaraObject& lara, const hid::InputHandler& inputHandler);
   void holsterTwoWeapons(LaraObject& lara, WeaponType weaponType);
   void holsterShotgun(LaraObject& lara);
   void overrideHolsterTwoWeaponsMeshes(LaraObject& lara, WeaponType weaponType);
@@ -81,6 +86,6 @@ struct AimInfo
   }
 
 private:
-  void updateAnimShotgunAiming(LaraObject& lara);
+  void updateAnimShotgunAiming(LaraObject& lara, const hid::InputHandler& inputHandler);
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/animating.cpp b/src/engine/objects/animating.cpp
index 140b7b1d7..2298c4118 100644
--- a/src/engine/objects/animating.cpp
+++ b/src/engine/objects/animating.cpp
@@ -7,7 +7,7 @@
 
 namespace engine::objects
 {
-void Animating::update()
+void Animating::updateLogic()
 {
   if(m_state.updateActivationTimeout())
   {
@@ -18,7 +18,7 @@ void Animating::update()
     m_state.goal_anim_state = 0_as;
   }
 
-  ModelObject::update();
+  advanceFrame();
   m_state.location.updateRoom();
   setCurrentRoom(m_state.location.room);
 }
diff --git a/src/engine/objects/animating.h b/src/engine/objects/animating.h
index 43cb94d3c..36f456b5f 100644
--- a/src/engine/objects/animating.h
+++ b/src/engine/objects/animating.h
@@ -30,6 +30,6 @@ class Animating final : public ModelObject
 public:
   MODELOBJECT_DEFAULT_CONSTRUCTORS(Animating, true, true)
 
-  void update() override;
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/atlanteanlava.cpp b/src/engine/objects/atlanteanlava.cpp
index 1809f9096..0be88520e 100644
--- a/src/engine/objects/atlanteanlava.cpp
+++ b/src/engine/objects/atlanteanlava.cpp
@@ -16,14 +16,14 @@
 #include "render/scene/node.h"
 
 #include <bitset>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::objects
 {
-void AtlanteanLava::update()
+void AtlanteanLava::updateLogic()
 {
   m_state.location.updateRoom();
-  setParent(gsl::not_null{getNode()}, m_state.location.room->node);
+  setParent(gsl_lite::not_null{getNode()}, m_state.location.room->node);
   if(m_state.triggerState != TriggerState::Deactivated)
   {
     auto location = m_state.location;
@@ -47,10 +47,10 @@ void AtlanteanLava::update()
       break;
     }
 
-    applyTransform();
+    applyLogicTransform();
 
-    const auto sector = location.updateRoom();
-    if(HeightInfo::fromFloor(sector, location.position, getWorld().getObjectManager().getObjects()).y
+    if(const auto sector = location.updateRoom();
+       HeightInfo::fromFloor(sector, location.position, getWorld().getObjectManager().getObjects()).y
        != m_state.location.position.Y)
     {
       m_state.triggerState = TriggerState::Deactivated;
@@ -62,7 +62,7 @@ void AtlanteanLava::update()
     getWorld().getObjectManager().getLara().burnIfAlive();
 
     auto& cameraController = getWorld().getCameraController();
-    cameraController.setLookAtObject(gsl::not_null{getWorld().getObjectManager().find(this)});
+    cameraController.setLookAtObject(gsl_lite::not_null{getWorld().getObjectManager().find(this)});
     cameraController.setMode(CameraMode::FixedPosition);
     cameraController.setModifier(CameraModifier::Chase);
     cameraController.setDistance(3_sectors);
@@ -84,4 +84,4 @@ void AtlanteanLava::collide(CollisionInfo& collisionInfo)
   const bool enableSpaz = !m_state.isDead() && collisionInfo.policies.is_set(CollisionInfo::PolicyFlags::EnableSpaz);
   enemyPush(collisionInfo, enableSpaz, false);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/atlanteanlava.h b/src/engine/objects/atlanteanlava.h
index 44ae98a18..c3fcfc067 100644
--- a/src/engine/objects/atlanteanlava.h
+++ b/src/engine/objects/atlanteanlava.h
@@ -27,7 +27,7 @@ class AtlanteanLava final : public ModelObject
 public:
   MODELOBJECT_DEFAULT_CONSTRUCTORS(AtlanteanLava, true, false)
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& collisionInfo) override;
 };
diff --git a/src/engine/objects/barricade.cpp b/src/engine/objects/barricade.cpp
index a466c86e8..dc4d47c60 100644
--- a/src/engine/objects/barricade.cpp
+++ b/src/engine/objects/barricade.cpp
@@ -7,7 +7,7 @@
 
 namespace engine::objects
 {
-void Barricade::update()
+void Barricade::updateLogic()
 {
   if(m_state.updateActivationTimeout())
   {
@@ -18,7 +18,7 @@ void Barricade::update()
     m_state.goal_anim_state = 0_as;
   }
 
-  ModelObject::update();
+  advanceFrame();
   m_state.location.updateRoom();
   setCurrentRoom(m_state.location.room);
 }
diff --git a/src/engine/objects/barricade.h b/src/engine/objects/barricade.h
index f67dd8c2a..12c9676ad 100644
--- a/src/engine/objects/barricade.h
+++ b/src/engine/objects/barricade.h
@@ -31,7 +31,7 @@ class Barricade final : public ModelObject
 public:
   MODELOBJECT_DEFAULT_CONSTRUCTORS(Barricade, true, false)
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& collisionInfo) override;
 };
diff --git a/src/engine/objects/bat.cpp b/src/engine/objects/bat.cpp
index 9b938218e..7f09810c3 100644
--- a/src/engine/objects/bat.cpp
+++ b/src/engine/objects/bat.cpp
@@ -13,7 +13,7 @@
 
 namespace engine::objects
 {
-void Bat::update()
+void Bat::updateLogic()
 {
   activateAi();
 
@@ -23,7 +23,7 @@ void Bat::update()
   static constexpr uint16_t Circling = 4;
   static constexpr uint16_t Dying = 5;
 
-  core::Angle turn = 0_deg;
+  auto turn = 0_deg;
   if(alive())
   {
     const ai::EnemyLocation enemyLocation{*this};
diff --git a/src/engine/objects/bat.h b/src/engine/objects/bat.h
index 43ff1a438..389a4e64c 100644
--- a/src/engine/objects/bat.h
+++ b/src/engine/objects/bat.h
@@ -21,6 +21,6 @@ class Bat final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Bat)
 
-  void update() override;
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/bear.cpp b/src/engine/objects/bear.cpp
index de42174d5..89b098d85 100644
--- a/src/engine/objects/bear.cpp
+++ b/src/engine/objects/bear.cpp
@@ -21,7 +21,7 @@
 
 namespace engine::objects
 {
-void Bear::update()
+void Bear::updateLogic()
 {
   activateAi();
 
diff --git a/src/engine/objects/bear.h b/src/engine/objects/bear.h
index 4ab43e807..18986f13d 100644
--- a/src/engine/objects/bear.h
+++ b/src/engine/objects/bear.h
@@ -22,7 +22,7 @@ class Bear final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Bear)
 
-  void update() override;
+  void updateLogic() override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
diff --git a/src/engine/objects/block.cpp b/src/engine/objects/block.cpp
index 32ee66bca..05bb9f331 100644
--- a/src/engine/objects/block.cpp
+++ b/src/engine/objects/block.cpp
@@ -7,6 +7,7 @@
 #include "core/units.h"
 #include "core/vec.h"
 #include "engine/collisioninfo.h"
+#include "engine/engine.h"
 #include "engine/floordata/floordata.h"
 #include "engine/heightinfo.h"
 #include "engine/location.h"
@@ -30,7 +31,7 @@
 
 #include <boost/throw_exception.hpp>
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <stdexcept>
 #include <string>
@@ -97,7 +98,7 @@ void Block::collide(CollisionInfo& /*collisionInfo*/)
       = snappedSector(getWorld().getObjectManager().getLara().m_state.location.position.*vp) + d;
 
     getWorld().getObjectManager().getLara().setGoalAnimState(loader::file::LaraStateId::PushableGrab);
-    getWorld().getObjectManager().getLara().advanceFrame();
+    getWorld().getObjectManager().getLara().advanceLaraFrame();
     if(getWorld().getObjectManager().getLara().getCurrentAnimState() == loader::file::LaraStateId::PushableGrab)
     {
       getWorld().getObjectManager().getLara().setHandStatus(HandStatus::Grabbing);
@@ -139,29 +140,29 @@ void Block::collide(CollisionInfo& /*collisionInfo*/)
   // start moving the block, remove it from the floordata
   activate();
   world::patchHeightsForBlock(*this, 1_sectors);
-  getSkeleton()->resetInterpolation();
+  getSkeleton()->resetSmoothing();
   m_state.triggerState = TriggerState::Active;
 
-  ModelObject::update();
-  getWorld().getObjectManager().getLara().advanceFrame();
+  advanceFrame();
+  getWorld().getObjectManager().getLara().advanceLaraFrame();
 }
 
-void Block::update()
+void Block::updateLogic()
 {
   if(m_state.activationState.isOneshot())
   {
     world::patchHeightsForBlock(*this, 1_sectors);
-    getSkeleton()->resetInterpolation();
+    getSkeleton()->resetSmoothing();
     kill();
     return;
   }
 
-  ModelObject::update();
+  advanceFrame();
 
   auto location = m_state.location;
   auto sector = location.updateRoom();
-  const auto height = HeightInfo::fromFloor(sector, location.position, getWorld().getObjectManager().getObjects()).y;
-  if(height > location.position.Y)
+  if(const auto height = HeightInfo::fromFloor(sector, location.position, getWorld().getObjectManager().getObjects()).y;
+     height > location.position.Y)
   {
     m_state.falling = true;
   }
@@ -173,7 +174,7 @@ void Block::update()
     m_state.triggerState = TriggerState::Deactivated;
     getWorld().dinoStompEffect(*this);
     playSoundEffect(TR1SoundEffect::BigFloorImpact);
-    applyTransform(); // needed for properly placing geometry on floor
+    applyLogicTransform(); // needed for properly placing geometry on floor
   }
 
   setCurrentRoom(location.room);
@@ -186,7 +187,7 @@ void Block::update()
   m_state.triggerState = TriggerState::Inactive;
   deactivate();
   world::patchHeightsForBlock(*this, -1_sectors);
-  getSkeleton()->resetInterpolation();
+  getSkeleton()->resetSmoothing();
   location = m_state.location;
   sector = location.updateRoom();
   getWorld().handleCommandSequence(
@@ -235,8 +236,7 @@ bool Block::canPushBlock(const core::Length& height, const core::Axis axis) cons
     return false;
   }
 
-  const auto targetSector = location.updateRoom();
-  if(targetSector->floorHeight != location.position.Y)
+  if(const auto targetSector = location.updateRoom(); targetSector->floorHeight != location.position.Y)
   {
     return false;
   }
@@ -288,8 +288,7 @@ bool Block::canPullBlock(const core::Length& height, const core::Axis axis) cons
 
   auto topPos = location;
   topPos.position.Y -= height;
-  const auto topSector = topPos.updateRoom();
-  if(topPos.position.Y < topSector->ceilingHeight)
+  if(const auto topSector = topPos.updateRoom(); topPos.position.Y < topSector->ceilingHeight)
   {
     return false;
   }
@@ -365,17 +364,17 @@ void Block::deserialize(const serialization::Deserializer<world::World>& ser)
 }
 
 Block::Block(const std::string& name,
-             const gsl::not_null<world::World*>& world,
-             const gsl::not_null<const world::Room*>& room,
+             const gsl_lite::not_null<world::World*>& world,
+             const gsl_lite::not_null<const world::Room*>& room,
              const loader::file::Item& item,
-             const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
   if(m_state.triggerState != TriggerState::Invisible)
   {
     world::patchHeightsForBlock(*this, -1_sectors);
-    getSkeleton()->resetInterpolation();
+    getSkeleton()->resetSmoothing();
   }
   getSkeleton()->getRenderState().setScissorTest(false);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/block.h b/src/engine/objects/block.h
index 10a062828..2b30b907d 100644
--- a/src/engine/objects/block.h
+++ b/src/engine/objects/block.h
@@ -5,7 +5,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -31,20 +31,20 @@ namespace engine::objects
 class Block final : public ModelObject
 {
 public:
-  Block(const gsl::not_null<world::World*>& world, const Location& location)
+  Block(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   Block(const std::string& name,
-        const gsl::not_null<world::World*>& world,
-        const gsl::not_null<const world::Room*>& room,
+        const gsl_lite::not_null<world::World*>& world,
+        const gsl_lite::not_null<const world::Room*>& room,
         const loader::file::Item& item,
-        const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+        const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
   void collide(CollisionInfo& collisionInfo) override;
 
-  void update() override;
+  void updateLogic() override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
@@ -56,4 +56,4 @@ class Block final : public ModelObject
 
   bool canPullBlock(const core::Length& height, core::Axis axis) const;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/boulder.cpp b/src/engine/objects/boulder.cpp
index c8cf72668..b978c2c49 100644
--- a/src/engine/objects/boulder.cpp
+++ b/src/engine/objects/boulder.cpp
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <bitset>
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -41,7 +41,7 @@ constexpr auto Stopped = 0_as;
 constexpr auto Rolling = 1_as;
 } // namespace
 
-void Boulder::update()
+void Boulder::updateLogic()
 {
   if(m_state.triggerState == TriggerState::Active)
   {
@@ -61,7 +61,7 @@ void Boulder::update()
       }
     }
     const auto oldPos = m_state.location.position;
-    ModelObject::update();
+    advanceFrame();
 
     auto sector = m_state.location.updateRoom();
     setCurrentRoom(m_state.location.room);
@@ -99,14 +99,14 @@ void Boulder::update()
     setCurrentRoom(m_location.room);
     getSkeleton()->setAnimation(
       m_state.current_anim_state,
-      gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(m_state.type)->animations[0]},
+      gsl_lite::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(m_state.type)->animations[0]},
       0_frame);
     m_state.goal_anim_state = m_state.current_anim_state;
     m_state.required_anim_state = Stopped;
     deactivate();
   }
 
-  applyTransform();
+  applyLogicTransform();
 }
 
 void Boulder::collide(CollisionInfo& collisionInfo)
@@ -137,7 +137,7 @@ void Boulder::collide(CollisionInfo& collisionInfo)
     lara.setCurrentRoom(m_state.location.room);
     lara.setAnimation(loader::file::AnimationId::SQUASH_BOULDER);
     getWorld().getCameraController().setModifier(CameraModifier::FollowCenter);
-    getWorld().getCameraController().setEyeRotation(-25_deg, 170_deg);
+    getWorld().getCameraController().setCinematicBaseRotation(-25_deg, 170_deg);
     lara.m_state.rotation.X = 0_deg;
     lara.m_state.rotation.Y = m_state.rotation.Y;
     lara.m_state.rotation.Z = 0_deg;
@@ -174,7 +174,7 @@ void Boulder::collide(CollisionInfo& collisionInfo)
   const auto z = lara.m_state.location.position.Z - m_state.location.position.Z;
   const auto xyz = std::max(1_sectors / 2, sqrt(util::square(x) + util::square(y) + util::square(z)));
 
-  auto fx = createBloodSplat(
+  const auto fx = createBloodSplat(
     getWorld(),
     Location{m_state.location.room,
              core::TRVec{x * 1_sectors / 2 / xyz + m_state.location.position.X,
@@ -186,10 +186,10 @@ void Boulder::collide(CollisionInfo& collisionInfo)
 }
 
 Boulder::Boulder(const std::string& name,
-                 const gsl::not_null<world::World*>& world,
-                 const gsl::not_null<const world::Room*>& room,
+                 const gsl_lite::not_null<world::World*>& world,
+                 const gsl_lite::not_null<const world::Room*>& room,
                  const loader::file::Item& item,
-                 const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                 const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, true}
     , m_location{room, item.position}
 {
@@ -202,4 +202,4 @@ void Boulder::deserialize(const serialization::Deserializer<world::World>& ser)
 
   getSkeleton()->getRenderState().setScissorTest(false);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/boulder.h b/src/engine/objects/boulder.h
index 5676254fa..52f24cae3 100644
--- a/src/engine/objects/boulder.h
+++ b/src/engine/objects/boulder.h
@@ -4,7 +4,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -29,19 +29,19 @@ namespace engine::objects
 class Boulder final : public ModelObject
 {
 public:
-  Boulder(const gsl::not_null<world::World*>& world, const Location& location)
+  Boulder(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
       , m_location{location}
   {
   }
 
   Boulder(const std::string& name,
-          const gsl::not_null<world::World*>& world,
-          const gsl::not_null<const world::Room*>& room,
+          const gsl_lite::not_null<world::World*>& world,
+          const gsl_lite::not_null<const world::Room*>& room,
           const loader::file::Item& item,
-          const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+          const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& collisionInfo) override;
 
@@ -50,4 +50,4 @@ class Boulder final : public ModelObject
 private:
   Location m_location;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/bridgeflat.h b/src/engine/objects/bridgeflat.h
index 1c108dd58..f05d67973 100644
--- a/src/engine/objects/bridgeflat.h
+++ b/src/engine/objects/bridgeflat.h
@@ -33,5 +33,10 @@ class BridgeFlat final : public ModelObject
 
     y = m_state.location.position.Y + core::QuarterSectorSize;
   }
+
+  void updateLogic() override
+  {
+    advanceFrame();
+  }
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/centaurstatue.cpp b/src/engine/objects/centaurstatue.cpp
index d9cd41855..f56906304 100644
--- a/src/engine/objects/centaurstatue.cpp
+++ b/src/engine/objects/centaurstatue.cpp
@@ -30,17 +30,17 @@
 #include <bitset>
 #include <boost/log/trivial.hpp>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
 namespace engine::objects
 {
 CentaurStatue::CentaurStatue(const std::string& name,
-                             const gsl::not_null<world::World*>& world,
-                             const gsl::not_null<const world::Room*>& room,
+                             const gsl_lite::not_null<world::World*>& world,
+                             const gsl_lite::not_null<const world::Room*>& room,
                              loader::file::Item item,
-                             const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, true}
 {
   if(const auto& model = world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::CentaurMutant); model != nullptr)
@@ -52,16 +52,17 @@ CentaurStatue::CentaurStatue(const std::string& name,
       world,
       room,
       item,
-      gsl::not_null{model.get()});
+      gsl_lite::not_null{model.get()});
     auto& childState = m_childObject->m_state;
     childState.activationState.setOneshot(true);
-    m_childObject->getSkeleton()->setAnimation(
-      childState.current_anim_state, gsl::not_null{&model->animations[7]}, model->animations[7].firstFrame + 36_frame);
+    m_childObject->getSkeleton()->setAnimation(childState.current_anim_state,
+                                               gsl_lite::not_null{&model->animations[7]},
+                                               model->animations[7].firstFrame + 36_frame);
     childState.goal_anim_state = childState.current_anim_state = model->animations[7].state_id;
     childState.rotation.Y = m_state.rotation.Y;
-    m_childObject->getSkeleton()->updatePose();
+    m_childObject->getSkeleton()->updateLogicPose(true);
     m_childObject->m_state.triggerState = TriggerState::Invisible;
-    getWorld().getObjectManager().registerObject(gsl::not_null{m_childObject});
+    getWorld().getObjectManager().registerObject(gsl_lite::not_null{m_childObject});
   }
   else
   {
@@ -69,7 +70,7 @@ CentaurStatue::CentaurStatue(const std::string& name,
   }
 }
 
-void CentaurStatue::update()
+void CentaurStatue::updateLogic()
 {
   const auto d = getWorld().getObjectManager().getLara().m_state.location.position - m_state.location.position;
   if(abs(d.Y) >= 1_sectors)
@@ -104,4 +105,4 @@ void CentaurStatue::collide(CollisionInfo& info)
 {
   collideWithLara(info);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/centaurstatue.h b/src/engine/objects/centaurstatue.h
index 01a4b00df..fb5e3f79f 100644
--- a/src/engine/objects/centaurstatue.h
+++ b/src/engine/objects/centaurstatue.h
@@ -3,7 +3,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -32,18 +32,18 @@ class AIAgent;
 class CentaurStatue final : public ModelObject
 {
 public:
-  CentaurStatue(const gsl::not_null<world::World*>& world, const Location& location)
+  CentaurStatue(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   CentaurStatue(const std::string& name,
-                const gsl::not_null<world::World*>& world,
-                const gsl::not_null<const world::Room*>& room,
+                const gsl_lite::not_null<world::World*>& world,
+                const gsl_lite::not_null<const world::Room*>& room,
                 loader::file::Item item,
-                const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& info) override;
 
@@ -53,4 +53,4 @@ class CentaurStatue final : public ModelObject
 private:
   std::shared_ptr<AIAgent> m_childObject{nullptr};
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/collapsiblefloor.cpp b/src/engine/objects/collapsiblefloor.cpp
index 117c4fa6b..7dcc75d96 100644
--- a/src/engine/objects/collapsiblefloor.cpp
+++ b/src/engine/objects/collapsiblefloor.cpp
@@ -12,13 +12,13 @@
 #include "serialization/serialization.h"
 
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
 namespace engine::objects
 {
-void CollapsibleFloor::update()
+void CollapsibleFloor::updateLogic()
 {
   if(m_state.current_anim_state == 0_as) // stationary
   {
@@ -39,7 +39,7 @@ void CollapsibleFloor::update()
     m_state.falling = true;
   }
 
-  ModelObject::update();
+  advanceFrame();
 
   if(m_state.triggerState == TriggerState::Deactivated)
   {
@@ -63,16 +63,16 @@ void CollapsibleFloor::update()
   m_state.falling = false;
 }
 
-CollapsibleFloor::CollapsibleFloor(const gsl::not_null<world::World*>& world, const Location& location)
+CollapsibleFloor::CollapsibleFloor(const gsl_lite::not_null<world::World*>& world, const Location& location)
     : ModelObject{world, location}
 {
 }
 
 CollapsibleFloor::CollapsibleFloor(const std::string& name,
-                                   const gsl::not_null<world::World*>& world,
-                                   const gsl::not_null<const world::Room*>& room,
+                                   const gsl_lite::not_null<world::World*>& world,
+                                   const gsl_lite::not_null<const world::Room*>& room,
                                    const loader::file::Item& item,
-                                   const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                                   const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
   getSkeleton()->getRenderState().setScissorTest(false);
@@ -88,4 +88,4 @@ void CollapsibleFloor::deserialize(const serialization::Deserializer<world::Worl
   ModelObject::deserialize(ser);
   getSkeleton()->getRenderState().setScissorTest(false);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/collapsiblefloor.h b/src/engine/objects/collapsiblefloor.h
index 62f093c75..23b3a03fe 100644
--- a/src/engine/objects/collapsiblefloor.h
+++ b/src/engine/objects/collapsiblefloor.h
@@ -9,7 +9,7 @@
 #include "qs/qs.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine::world
@@ -29,15 +29,15 @@ namespace engine::objects
 class CollapsibleFloor final : public ModelObject
 {
 public:
-  CollapsibleFloor(const gsl::not_null<world::World*>& world, const Location& location);
+  CollapsibleFloor(const gsl_lite::not_null<world::World*>& world, const Location& location);
 
   CollapsibleFloor(const std::string& name,
-                   const gsl::not_null<world::World*>& world,
-                   const gsl::not_null<const world::Room*>& room,
+                   const gsl_lite::not_null<world::World*>& world,
+                   const gsl_lite::not_null<const world::Room*>& room,
                    const loader::file::Item& item,
-                   const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                   const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void patchFloor(const core::TRVec& pos, core::Length& y) override
   {
@@ -64,4 +64,4 @@ class CollapsibleFloor final : public ModelObject
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/cowboy.cpp b/src/engine/objects/cowboy.cpp
index 6aef20240..8d38f5d23 100644
--- a/src/engine/objects/cowboy.cpp
+++ b/src/engine/objects/cowboy.cpp
@@ -17,18 +17,18 @@
 #include "serialization/serialization.h"
 #include "util/helpers.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::objects
 {
-void Cowboy::update()
+void Cowboy::updateLogic()
 {
   activateAi();
 
-  core::Angle tiltRot = 0_deg;
-  core::Angle turn = 0_deg;
-  core::Angle headRot = 0_deg;
+  auto tiltRot = 0_deg;
+  auto turn = 0_deg;
+  auto headRot = 0_deg;
   if(alive())
   {
     const ai::EnemyLocation enemyLocation{*this};
@@ -110,7 +110,7 @@ void Cowboy::update()
         }
         else
         {
-          auto p = emitParticle({-2_len, 200_len, 40_len}, 8, &createMuzzleFlash);
+          const auto p = emitParticle({-2_len, 200_len, 40_len}, 8, &createMuzzleFlash);
           p->angle.Y += headRot;
         }
       }
@@ -127,7 +127,7 @@ void Cowboy::update()
   else if(m_state.current_anim_state != 5_as) // injured/dying
   {
     getSkeleton()->setAnim(
-      gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Cowboy)->animations[7]});
+      gsl_lite::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Cowboy)->animations[7]});
     m_state.current_anim_state = 5_as;
     getWorld().createPickup(TR1ItemId::MagnumsSprite, m_state.location.room, m_state.location.position);
   }
@@ -149,4 +149,4 @@ void Cowboy::deserialize(const serialization::Deserializer<world::World>& ser)
   AIAgent::deserialize(ser);
   ser(S_NV("aimTime", m_aimTime));
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/cowboy.h b/src/engine/objects/cowboy.h
index 8430327ac..bce73aee9 100644
--- a/src/engine/objects/cowboy.h
+++ b/src/engine/objects/cowboy.h
@@ -23,7 +23,7 @@ class Cowboy final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Cowboy)
 
-  void update() override;
+  void updateLogic() override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
diff --git a/src/engine/objects/crocodile.cpp b/src/engine/objects/crocodile.cpp
index eee57fdcd..95d6d7521 100644
--- a/src/engine/objects/crocodile.cpp
+++ b/src/engine/objects/crocodile.cpp
@@ -23,7 +23,7 @@
 #include "util/helpers.h"
 
 #include <boost/assert.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 #include <tuple>
@@ -46,7 +46,7 @@ constexpr auto OnLandDead = 7_as;
 
 void Crocodile::updateInWaterAlive()
 {
-  core::Angle headRot = 0_deg;
+  auto headRot = 0_deg;
   const ai::EnemyLocation enemyLocation{*this};
   if(enemyLocation.laraInView)
   {
@@ -91,7 +91,7 @@ void Crocodile::updateInWaterAlive()
   else
   {
     m_state.type = TR1ItemId::CrocodileOnLand;
-    getSkeleton()->setAnim(gsl::not_null{
+    getSkeleton()->setAnim(gsl_lite::not_null{
       &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::CrocodileOnLand)->animations[0]});
     goal(getSkeleton()->getAnim()->state_id);
     m_state.current_anim_state = getSkeleton()->getAnim()->state_id;
@@ -109,7 +109,7 @@ void Crocodile::updateInWaterDead()
 {
   if(m_state.current_anim_state != InWaterDead)
   {
-    getSkeleton()->setAnim(gsl::not_null{
+    getSkeleton()->setAnim(gsl_lite::not_null{
       &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::CrocodileInWater)->animations[4]});
     m_state.current_anim_state = InWaterDead;
     m_state.health = core::DeadHealth;
@@ -128,7 +128,7 @@ void Crocodile::updateInWaterDead()
   }
   else
   {
-    getSkeleton()->setAnim(gsl::not_null{
+    getSkeleton()->setAnim(gsl_lite::not_null{
       &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::CrocodileOnLand)->animations[11]});
     m_state.type = TR1ItemId::CrocodileOnLand;
     goal(OnLandDead);
@@ -140,7 +140,7 @@ void Crocodile::updateInWaterDead()
 
     loadObjectInfo(true);
   }
-  ModelObject::update();
+  advanceFrame();
   const auto sector = m_state.location.updateRoom();
   m_state.floor
     = HeightInfo::fromFloor(sector, m_state.location.position, getWorld().getObjectManager().getObjects()).y;
@@ -161,8 +161,8 @@ void Crocodile::updateInWater()
 
 std::tuple<core::Angle, core::Angle> Crocodile::updateOnLandAlive()
 {
-  core::Angle turnRot = 0_deg;
-  core::Angle headRot = 0_deg;
+  auto turnRot = 0_deg;
+  auto headRot = 0_deg;
   const ai::EnemyLocation enemyLocation{*this};
   if(enemyLocation.laraInView)
   {
@@ -247,8 +247,8 @@ void Crocodile::updateOnLandDead()
   if(m_state.current_anim_state == OnLandDead)
     return;
 
-  getSkeleton()->setAnim(
-    gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::CrocodileOnLand)->animations[11]});
+  getSkeleton()->setAnim(gsl_lite::not_null{
+    &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::CrocodileOnLand)->animations[11]});
   m_state.current_anim_state = OnLandDead;
   m_state.health = core::DeadHealth;
 }
@@ -256,8 +256,8 @@ void Crocodile::updateOnLandDead()
 void Crocodile::updateOnLand()
 {
   BOOST_ASSERT(m_state.type == TR1ItemId::CrocodileOnLand);
-  core::Angle turn = 0_deg;
-  core::Angle headRot = 0_deg;
+  auto turn = 0_deg;
+  auto headRot = 0_deg;
   if(alive())
   {
     std::tie(headRot, turn) = updateOnLandAlive();
@@ -272,7 +272,7 @@ void Crocodile::updateOnLand()
   }
   if(m_state.location.room->isWaterRoom)
   {
-    getSkeleton()->setAnim(gsl::not_null{
+    getSkeleton()->setAnim(gsl_lite::not_null{
       &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::CrocodileInWater)->animations[0]});
     goal(getSkeleton()->getAnim()->state_id);
     m_state.current_anim_state = getSkeleton()->getAnim()->state_id;
@@ -291,11 +291,11 @@ void Crocodile::updateOnLand()
   }
   else
   {
-    ModelObject::update();
+    advanceFrame();
   }
 }
 
-void Crocodile::update()
+void Crocodile::updateLogic()
 {
   activateAi();
 
@@ -308,4 +308,4 @@ void Crocodile::update()
     updateOnLand();
   }
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/crocodile.h b/src/engine/objects/crocodile.h
index 245d65a19..e3edff12f 100644
--- a/src/engine/objects/crocodile.h
+++ b/src/engine/objects/crocodile.h
@@ -24,7 +24,7 @@ class Crocodile final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Crocodile)
 
-  void update() override;
+  void updateLogic() override;
 
 private:
   void updateInWater();
diff --git a/src/engine/objects/cutsceneactors.cpp b/src/engine/objects/cutsceneactors.cpp
index ef7daedae..1697ba34f 100644
--- a/src/engine/objects/cutsceneactors.cpp
+++ b/src/engine/objects/cutsceneactors.cpp
@@ -6,31 +6,31 @@
 #include "modelobject.h"
 #include "objectstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine::objects
 {
 CutsceneActor::CutsceneActor(const std::string& name,
-                             const gsl::not_null<world::World*>& world,
-                             const gsl::not_null<const world::Room*>& room,
+                             const gsl_lite::not_null<world::World*>& world,
+                             const gsl_lite::not_null<const world::Room*>& room,
                              const loader::file::Item& item,
-                             const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, true}
 {
   activate();
   m_state.rotation.Y = 0_deg;
 }
 
-void CutsceneActor::update()
+void CutsceneActor::updateLogic()
 {
-  m_state.rotation.Y = getWorld().getCameraController().getEyeRotation().Y;
-  m_state.location.position = getWorld().getCameraController().getTRLocation().position;
-  ModelObject::update();
+  m_state.rotation.Y = getWorld().getCameraController().getCinematicBaseRotation().Y;
+  m_state.location.position = getWorld().getCameraController().getCinematicPos();
+  advanceFrame();
 }
 
-void CutsceneActor4::update()
+void CutsceneActor4::updateLogic()
 {
-  ModelObject::update(); // NOLINT(bugprone-parent-virtual-call)
+  advanceFrame();
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/cutsceneactors.h b/src/engine/objects/cutsceneactors.h
index f2a249519..032720618 100644
--- a/src/engine/objects/cutsceneactors.h
+++ b/src/engine/objects/cutsceneactors.h
@@ -2,7 +2,7 @@
 
 #include "modelobject.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -27,33 +27,33 @@ namespace engine::objects
 class CutsceneActor : public ModelObject
 {
 public:
-  CutsceneActor(const gsl::not_null<world::World*>& world, const Location& location)
+  CutsceneActor(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   CutsceneActor(const std::string& name,
-                const gsl::not_null<world::World*>& world,
-                const gsl::not_null<const world::Room*>& room,
+                const gsl_lite::not_null<world::World*>& world,
+                const gsl_lite::not_null<const world::Room*>& room,
                 const loader::file::Item& item,
-                const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 };
 
 class CutsceneActor1 final : public CutsceneActor
 {
 public:
-  CutsceneActor1(const gsl::not_null<world::World*>& world, const Location& location)
+  CutsceneActor1(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : CutsceneActor{world, location}
   {
   }
 
   CutsceneActor1(const std::string& name,
-                 const gsl::not_null<world::World*>& world,
-                 const gsl::not_null<const world::Room*>& room,
+                 const gsl_lite::not_null<world::World*>& world,
+                 const gsl_lite::not_null<const world::Room*>& room,
                  const loader::file::Item& item,
-                 const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                 const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : CutsceneActor(name, world, room, item, animatedModel)
   {
   }
@@ -62,16 +62,16 @@ class CutsceneActor1 final : public CutsceneActor
 class CutsceneActor2 final : public CutsceneActor
 {
 public:
-  CutsceneActor2(const gsl::not_null<world::World*>& world, const Location& location)
+  CutsceneActor2(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : CutsceneActor{world, location}
   {
   }
 
   CutsceneActor2(const std::string& name,
-                 const gsl::not_null<world::World*>& world,
-                 const gsl::not_null<const world::Room*>& room,
+                 const gsl_lite::not_null<world::World*>& world,
+                 const gsl_lite::not_null<const world::Room*>& room,
                  const loader::file::Item& item,
-                 const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                 const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : CutsceneActor(name, world, room, item, animatedModel)
   {
   }
@@ -80,16 +80,16 @@ class CutsceneActor2 final : public CutsceneActor
 class CutsceneActor3 final : public CutsceneActor
 {
 public:
-  CutsceneActor3(const gsl::not_null<world::World*>& world, const Location& location)
+  CutsceneActor3(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : CutsceneActor{world, location}
   {
   }
 
   CutsceneActor3(const std::string& name,
-                 const gsl::not_null<world::World*>& world,
-                 const gsl::not_null<const world::Room*>& room,
+                 const gsl_lite::not_null<world::World*>& world,
+                 const gsl_lite::not_null<const world::Room*>& room,
                  const loader::file::Item& item,
-                 const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                 const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : CutsceneActor(name, world, room, item, animatedModel)
   {
   }
@@ -98,20 +98,20 @@ class CutsceneActor3 final : public CutsceneActor
 class CutsceneActor4 final : public CutsceneActor
 {
 public:
-  CutsceneActor4(const gsl::not_null<world::World*>& world, const Location& location)
+  CutsceneActor4(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : CutsceneActor{world, location}
   {
   }
 
   CutsceneActor4(const std::string& name,
-                 const gsl::not_null<world::World*>& world,
-                 const gsl::not_null<const world::Room*>& room,
+                 const gsl_lite::not_null<world::World*>& world,
+                 const gsl_lite::not_null<const world::Room*>& room,
                  const loader::file::Item& item,
-                 const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                 const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : CutsceneActor(name, world, room, item, animatedModel)
   {
   }
 
-  void update() override;
+  void updateLogic() override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/dart.cpp b/src/engine/objects/dart.cpp
index d07763cd8..19f59970e 100644
--- a/src/engine/objects/dart.cpp
+++ b/src/engine/objects/dart.cpp
@@ -17,7 +17,7 @@
 #include "render/scene/node.h"
 
 #include <bitset>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <utility>
 
@@ -28,19 +28,19 @@ void Dart::collide(CollisionInfo& info)
   collideWithLara(info);
 }
 
-void Dart::update()
+void Dart::updateLogic()
 {
   if(m_state.touch_bits != 0)
   {
     getWorld().hitLara(50_hp);
 
-    auto fx = createBloodSplat(getWorld(), m_state.location, m_state.speed, m_state.rotation.Y);
+    const auto fx = createBloodSplat(getWorld(), m_state.location, m_state.speed, m_state.rotation.Y);
     getWorld().getObjectManager().registerParticle(fx);
   }
 
   const auto oldLocation = m_state.location;
 
-  ModelObject::update();
+  advanceFrame();
   const auto sector = m_state.location.updateRoom();
   setCurrentRoom(m_state.location.room);
 
@@ -55,10 +55,10 @@ void Dart::update()
   const auto ricochetPos
     = std::get<1>(raycastLineOfSight(oldLocation, m_state.location.position, getWorld().getObjectManager()));
 
-  auto particle = gsl::make_shared<RicochetParticle>(ricochetPos, getWorld());
+  auto particle = gsl_lite::make_shared<RicochetParticle>(ricochetPos, getWorld());
   setParent(particle, ricochetPos.room->node);
   particle->angle = m_state.rotation;
   particle->timePerSpriteFrame = 6;
   getWorld().getObjectManager().registerParticle(std::move(particle));
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/dart.h b/src/engine/objects/dart.h
index 9a2201555..54618a7cf 100644
--- a/src/engine/objects/dart.h
+++ b/src/engine/objects/dart.h
@@ -3,7 +3,7 @@
 #include "modelobject.h"
 #include "objectstate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -29,16 +29,16 @@ namespace engine::objects
 class Dart final : public ModelObject
 {
 public:
-  Dart(const gsl::not_null<world::World*>& world, const Location& location)
+  Dart(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   Dart(const std::string& name,
-       const gsl::not_null<world::World*>& world,
-       const gsl::not_null<const world::Room*>& room,
+       const gsl_lite::not_null<world::World*>& world,
+       const gsl_lite::not_null<const world::Room*>& room,
        const loader::file::Item& item,
-       const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+       const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : ModelObject{name, world, room, item, true, animatedModel, true}
   {
     m_state.collidable = true;
@@ -46,6 +46,6 @@ class Dart final : public ModelObject
 
   void collide(CollisionInfo& info) override;
 
-  void update() override;
+  void updateLogic() override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/dartgun.cpp b/src/engine/objects/dartgun.cpp
index 014481717..6b3af3d71 100644
--- a/src/engine/objects/dartgun.cpp
+++ b/src/engine/objects/dartgun.cpp
@@ -19,11 +19,11 @@
 #include "qs/quantity.h"
 #include "render/scene/node.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <utility>
 
-void engine::objects::DartGun::update()
+void engine::objects::DartGun::updateLogic()
 {
   if(m_state.updateActivationTimeout())
   {
@@ -39,7 +39,7 @@ void engine::objects::DartGun::update()
 
   if(m_state.current_anim_state != 1_as || getSkeleton()->getLocalFrame() != 0_frame)
   {
-    ModelObject::update();
+    advanceFrame();
     return;
   }
 
@@ -65,16 +65,16 @@ void engine::objects::DartGun::update()
     break;
   }
 
-  auto dart = getWorld().createDynamicObject<Dart>(
+  const auto dart = getWorld().createDynamicObject<Dart>(
     TR1ItemId::Dart, m_state.location.room, m_state.rotation.Y, m_state.location.position - d, 0);
   dart->activate();
   auto& dartState = dart->m_state;
   dartState.triggerState = TriggerState::Active;
 
-  auto particle = gsl::make_shared<SmokeParticle>(dartState.location, getWorld(), dartState.rotation);
+  auto particle = gsl_lite::make_shared<SmokeParticle>(dartState.location, getWorld(), dartState.rotation);
   setParent(particle, dartState.location.room->node);
   getWorld().getObjectManager().registerParticle(std::move(particle));
 
   playSoundEffect(TR1SoundEffect::DartgunShoot);
-  ModelObject::update();
-}
+  advanceFrame();
+}
\ No newline at end of file
diff --git a/src/engine/objects/dartgun.h b/src/engine/objects/dartgun.h
index 2252d29d0..4605d8607 100644
--- a/src/engine/objects/dartgun.h
+++ b/src/engine/objects/dartgun.h
@@ -26,6 +26,6 @@ class DartGun final : public ModelObject
 public:
   MODELOBJECT_DEFAULT_CONSTRUCTORS(DartGun, true, false)
 
-  void update() override;
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/door.cpp b/src/engine/objects/door.cpp
index 1b06f1eb3..5091279e0 100644
--- a/src/engine/objects/door.cpp
+++ b/src/engine/objects/door.cpp
@@ -19,7 +19,7 @@
 
 #include <functional>
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -28,10 +28,10 @@ namespace engine::objects
 // #define NO_DOOR_BLOCK
 
 Door::Door(const std::string& name,
-           const gsl::not_null<world::World*>& world,
-           const gsl::not_null<const world::Room*>& room,
+           const gsl_lite::not_null<world::World*>& world,
+           const gsl_lite::not_null<const world::Room*>& room,
            const loader::file::Item& item,
-           const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+           const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
 #ifndef NO_DOOR_BLOCK
@@ -85,10 +85,10 @@ Door::Door(const std::string& name,
   getSkeleton()->getRenderState().setPolygonOffset(-1, -1);
 }
 
-void Door::update()
+void Door::updateLogic()
 {
-  static const constexpr auto Closed = 0_as;
-  static const constexpr auto Opened = 1_as;
+  static constexpr auto Closed = 0_as;
+  static constexpr auto Opened = 1_as;
 
   if(m_state.updateActivationTimeout())
   {
@@ -124,7 +124,7 @@ void Door::update()
   }
 
   const auto oldLocation = m_state.location;
-  ModelObject::update();
+  advanceFrame();
   m_state.location = oldLocation;
   setCurrentRoom(m_state.location.room);
 }
@@ -251,4 +251,4 @@ void Door::Info::deserialize(const serialization::Deserializer<world::World>& se
       S_NV_VECTOR_ELEMENT("box", std::cref(ser.context->getBoxes()), std::ref(wingsBox)));
   wingsSector = nullptr;
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/door.h b/src/engine/objects/door.h
index 221244380..4c83c46af 100644
--- a/src/engine/objects/door.h
+++ b/src/engine/objects/door.h
@@ -5,7 +5,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -32,18 +32,18 @@ namespace engine::objects
 class Door final : public ModelObject
 {
 public:
-  Door(const gsl::not_null<world::World*>& world, const Location& location)
+  Door(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   Door(const std::string& name,
-       const gsl::not_null<world::World*>& world,
-       const gsl::not_null<const world::Room*>& room,
+       const gsl_lite::not_null<world::World*>& world,
+       const gsl_lite::not_null<const world::Room*>& room,
        const loader::file::Item& item,
-       const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+       const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& collisionInfo) override;
 
@@ -71,4 +71,4 @@ class Door final : public ModelObject
   // this is the "blocking" position, where floor data will be modified to add an artificial wall
   core::TRVec m_wingsPosition;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/doppelganger.cpp b/src/engine/objects/doppelganger.cpp
index 36088d736..039ef5097 100644
--- a/src/engine/objects/doppelganger.cpp
+++ b/src/engine/objects/doppelganger.cpp
@@ -26,7 +26,7 @@
 
 #include <cstddef>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <serialization/optional_value.h>
 #include <string>
@@ -34,20 +34,20 @@
 namespace engine::objects
 {
 Doppelganger::Doppelganger(const std::string& name,
-                           const gsl::not_null<world::World*>& world,
-                           const gsl::not_null<const world::Room*>& room,
+                           const gsl_lite::not_null<world::World*>& world,
+                           const gsl_lite::not_null<const world::Room*>& room,
                            const loader::file::Item& item,
-                           const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                           const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, true}
 {
   const auto& laraModel = world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::Lara);
   getSkeleton()->setAnimation(
-    m_state.current_anim_state, gsl::not_null{&laraModel->animations[0]}, laraModel->animations->firstFrame);
+    m_state.current_anim_state, gsl_lite::not_null{&laraModel->animations[0]}, laraModel->animations->firstFrame);
 }
 
-void Doppelganger::update()
+void Doppelganger::updateLogic()
 {
-  auto& lara = getWorld().getObjectManager().getLara();
+  const auto& lara = getWorld().getObjectManager().getLara();
 
   if(m_state.health < core::LaraHealth)
   {
@@ -63,14 +63,14 @@ void Doppelganger::update()
     m_state.rotation = lara.m_state.rotation - core::TRRotation{0_deg, 180_deg, 0_deg};
 
     const auto sector = m_state.location.updateRoom();
-    setParent(gsl::not_null{getNode()}, m_state.location.room->node);
+    setParent(gsl_lite::not_null{getNode()}, m_state.location.room->node);
     m_state.floor
       = HeightInfo::fromFloor(sector, m_state.location.position, getWorld().getObjectManager().getObjects()).y;
 
     const auto laraSector = lara.m_state.location.moved({}).updateRoom();
     const auto laraFloor
       = HeightInfo::fromFloor(laraSector, lara.m_state.location.position, getWorld().getObjectManager().getObjects()).y;
-    getSkeleton()->setAnim(gsl::not_null{lara.getSkeleton()->getAnim()}, lara.getSkeleton()->getFrame());
+    getSkeleton()->setAnim(gsl_lite::not_null{lara.getSkeleton()->getAnim()}, lara.getSkeleton()->getFrame());
 
     if(laraFloor + 1_sectors <= m_state.floor && !lara.m_state.falling)
     {
@@ -78,7 +78,7 @@ void Doppelganger::update()
 
       getSkeleton()->setAnimation(
         m_state.current_anim_state,
-        gsl::not_null{&getWorld().getWorldGeometry().getAnimation(loader::file::AnimationId::SMASH_JUMP)},
+        gsl_lite::not_null{&getWorld().getWorldGeometry().getAnimation(loader::file::AnimationId::SMASH_JUMP)},
         getWorld().getWorldGeometry().getAnimation(loader::file::AnimationId::SMASH_JUMP).firstFrame + 1_frame);
       m_state.goal_anim_state = loader::file::LaraStateId::FreeFall;
       m_state.current_anim_state = loader::file::LaraStateId::FreeFall;
@@ -91,7 +91,7 @@ void Doppelganger::update()
 
   if(m_killed)
   {
-    ModelObject::update();
+    advanceFrame();
     const auto sector = m_state.location.moved({}).updateRoom();
     const auto hi
       = HeightInfo::fromFloor(sector, m_state.location.position, getWorld().getObjectManager().getObjects());
@@ -116,10 +116,10 @@ void Doppelganger::update()
     gsl_Assert(getSkeleton()->getBoneCount() == lara.getSkeleton()->getBoneCount());
     for(size_t i = 0; i < getSkeleton()->getBoneCount(); ++i)
     {
-      getSkeleton()->setPoseMatrix(i, lara.getSkeleton()->getPoseMatrix(i));
+      getSkeleton()->setPoseMatrix(i, lara.getSkeleton()->getPoseMatrix(i), lara.getSkeleton()->getNextPoseMatrix(i));
     }
 
-    applyTransform();
+    applyLogicTransform();
   }
 }
 
@@ -135,4 +135,4 @@ void Doppelganger::deserialize(const serialization::Deserializer<world::World>&
   // TODO CE-675
   ser(S_NV("killed", m_killed), S_NVO("centerX", std::ref(m_centerX)), S_NVO("centerZ", std::ref(m_centerZ)));
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/doppelganger.h b/src/engine/objects/doppelganger.h
index 64edf7a51..217fcf033 100644
--- a/src/engine/objects/doppelganger.h
+++ b/src/engine/objects/doppelganger.h
@@ -5,7 +5,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -30,18 +30,18 @@ namespace engine::objects
 class Doppelganger final : public ModelObject
 {
 public:
-  Doppelganger(const gsl::not_null<world::World*>& world, const Location& location)
+  Doppelganger(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   Doppelganger(const std::string& name,
-               const gsl::not_null<world::World*>& world,
-               const gsl::not_null<const world::Room*>& room,
+               const gsl_lite::not_null<world::World*>& world,
+               const gsl_lite::not_null<const world::Room*>& room,
                const loader::file::Item& item,
-               const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+               const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
@@ -58,4 +58,4 @@ class Doppelganger final : public ModelObject
   core::Length m_centerX = 72_sectors;
   core::Length m_centerZ = 120_sectors;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/earthquake.cpp b/src/engine/objects/earthquake.cpp
index 1a91c559c..b238ec618 100644
--- a/src/engine/objects/earthquake.cpp
+++ b/src/engine/objects/earthquake.cpp
@@ -11,19 +11,19 @@
 
 namespace engine::objects
 {
-void Earthquake::update()
+void Earthquake::updateLogic()
 {
   if(!m_state.updateActivationTimeout())
     return;
 
   if(util::rand15() < 256)
   {
-    getWorld().getCameraController().setBounce(-150_len);
+    getWorld().getCameraController().setShake(-150_len);
     getWorld().getAudioEngine().playSoundEffect(TR1SoundEffect::Boulder, nullptr);
   }
   else if(util::rand15() < 1024)
   {
-    getWorld().getCameraController().setBounce(50_len);
+    getWorld().getCameraController().setShake(50_len);
     getWorld().getAudioEngine().playSoundEffect(TR1SoundEffect::BigFloorImpact, nullptr);
   }
 }
diff --git a/src/engine/objects/earthquake.h b/src/engine/objects/earthquake.h
index cc79cf097..fd3d7f58f 100644
--- a/src/engine/objects/earthquake.h
+++ b/src/engine/objects/earthquake.h
@@ -2,7 +2,7 @@
 
 #include "modelobject.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -27,20 +27,20 @@ namespace engine::objects
 class Earthquake final : public NullRenderModelObject
 {
 public:
-  Earthquake(const gsl::not_null<world::World*>& world, const Location& location)
+  Earthquake(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : NullRenderModelObject{world, location}
   {
   }
 
   Earthquake(const std::string& name,
-             const gsl::not_null<world::World*>& world,
-             const gsl::not_null<const world::Room*>& room,
+             const gsl_lite::not_null<world::World*>& world,
+             const gsl_lite::not_null<const world::Room*>& room,
              const loader::file::Item& item,
-             const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : NullRenderModelObject{name, world, room, item, true, animatedModel}
   {
   }
 
-  void update() override;
+  void updateLogic() override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/fallingceiling.cpp b/src/engine/objects/fallingceiling.cpp
index b1e56b65e..3b009daee 100644
--- a/src/engine/objects/fallingceiling.cpp
+++ b/src/engine/objects/fallingceiling.cpp
@@ -16,7 +16,7 @@
 
 namespace engine::objects
 {
-void FallingCeiling::update()
+void FallingCeiling::updateLogic()
 {
   if(m_state.current_anim_state == 0_as)
   {
@@ -28,7 +28,7 @@ void FallingCeiling::update()
     getWorld().hitLara(300_hp);
   }
 
-  ModelObject::update();
+  advanceFrame();
 
   if(m_state.triggerState == TriggerState::Deactivated)
   {
diff --git a/src/engine/objects/fallingceiling.h b/src/engine/objects/fallingceiling.h
index 65796adb0..b6f4f74a6 100644
--- a/src/engine/objects/fallingceiling.h
+++ b/src/engine/objects/fallingceiling.h
@@ -31,7 +31,7 @@ class FallingCeiling final : public ModelObject
 public:
   MODELOBJECT_DEFAULT_CONSTRUCTORS(FallingCeiling, true, false)
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& collisionInfo) override;
 };
diff --git a/src/engine/objects/flameemitter.cpp b/src/engine/objects/flameemitter.cpp
index c4b869f85..0590a04fb 100644
--- a/src/engine/objects/flameemitter.cpp
+++ b/src/engine/objects/flameemitter.cpp
@@ -10,12 +10,12 @@
 #include "objectstate.h"
 #include "render/scene/node.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::objects
 {
-void FlameEmitter::update()
+void FlameEmitter::updateLogic()
 {
   if(m_state.updateActivationTimeout())
   {
@@ -23,8 +23,8 @@ void FlameEmitter::update()
       return;
 
     m_flame = std::make_shared<FlameParticle>(m_state.location, getWorld());
-    setParent(gsl::not_null{m_flame}, m_state.location.room->node);
-    getWorld().getObjectManager().registerParticle(gsl::not_null{m_flame});
+    setParent(gsl_lite::not_null{m_flame}, m_state.location.room->node);
+    getWorld().getObjectManager().registerParticle(gsl_lite::not_null{m_flame});
   }
   else if(m_flame != nullptr)
   {
@@ -41,4 +41,4 @@ void FlameEmitter::removeParticle()
   getWorld().getObjectManager().eraseParticle(m_flame);
   m_flame.reset();
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/flameemitter.h b/src/engine/objects/flameemitter.h
index 3a7ffc839..601e7fe8d 100644
--- a/src/engine/objects/flameemitter.h
+++ b/src/engine/objects/flameemitter.h
@@ -2,7 +2,7 @@
 
 #include "modelobject.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -29,25 +29,25 @@ namespace engine::objects
 class FlameEmitter final : public NullRenderModelObject
 {
 public:
-  FlameEmitter(const gsl::not_null<world::World*>& world, const Location& location)
+  FlameEmitter(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : NullRenderModelObject{world, location}
   {
   }
 
   FlameEmitter(const std::string& name,
-               const gsl::not_null<world::World*>& world,
-               const gsl::not_null<const world::Room*>& room,
+               const gsl_lite::not_null<world::World*>& world,
+               const gsl_lite::not_null<const world::Room*>& room,
                const loader::file::Item& item,
-               const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+               const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : NullRenderModelObject{name, world, room, item, true, animatedModel}
   {
   }
 
-  void update() override;
+  void updateLogic() override;
 
 private:
   std::shared_ptr<Particle> m_flame;
 
   void removeParticle();
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/gorilla.cpp b/src/engine/objects/gorilla.cpp
index e94c7fdbf..7705e267a 100644
--- a/src/engine/objects/gorilla.cpp
+++ b/src/engine/objects/gorilla.cpp
@@ -1,4 +1,3 @@
-
 #include "gorilla.h"
 
 #include "aiagent.h"
@@ -21,17 +20,17 @@
 #include "util/helpers.h"
 
 #include <boost/assert.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::objects
 {
-void Gorilla::update()
+void Gorilla::updateLogic()
 {
   activateAi();
 
-  core::Angle headRot = 0_deg;
-  core::Angle turn = 0_deg;
+  auto headRot = 0_deg;
+  auto turn = 0_deg;
 
   if(alive())
   {
@@ -75,8 +74,7 @@ void Gorilla::update()
       }
       else
       {
-        const auto r = util::rand15(1024);
-        if(r < 160)
+        if(const auto r = util::rand15(1024); r < 160)
         {
           // jump and wave arms
           goal(10_as);
@@ -119,8 +117,7 @@ void Gorilla::update()
       else if(!isEscaping())
       {
         // random "rage" animation
-        const auto r = util::rand15();
-        if(r < 160)
+        if(const auto r = util::rand15(); r < 160)
           goal(1_as, 10_as);
         else if(r < 320)
           goal(1_as, 6_as);
@@ -162,7 +159,7 @@ void Gorilla::update()
   else if(m_state.current_anim_state != 5_as)
   {
     // die
-    getSkeleton()->setAnim(gsl::not_null{
+    getSkeleton()->setAnim(gsl_lite::not_null{
       &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Gorilla)->animations[7 + util::rand15(2)]});
     m_state.current_anim_state = 5_as;
   }
@@ -194,9 +191,8 @@ void Gorilla::update()
   // rotate for climbing
   const auto xSectorOld = sectorOf(old.X);
   const auto zSectorOld = sectorOf(old.Z);
-  const auto xSectorNew = sectorOf(m_state.location.position.X);
-  const auto zSectorNew = sectorOf(m_state.location.position.Z);
-  if(zSectorOld == zSectorNew)
+  if(const auto xSectorNew = sectorOf(m_state.location.position.X), zSectorNew = sectorOf(m_state.location.position.Z);
+     zSectorOld == zSectorNew)
   {
     if(xSectorOld == xSectorNew)
     {
@@ -229,7 +225,7 @@ void Gorilla::update()
 
   m_state.location.position.Y = old.Y;
   getSkeleton()->setAnim(
-    gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Gorilla)->animations[19]});
+    gsl_lite::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Gorilla)->animations[19]});
   m_state.current_anim_state = 11_as;
 }
 
@@ -244,4 +240,4 @@ void Gorilla::deserialize(const serialization::Deserializer<world::World>& ser)
   AIAgent::deserialize(ser);
   ser(S_NV("wantAttack", m_wantAttack), S_NV("turnedRight", m_crabWalkRight), S_NV("turnedLeft", m_crabWalkLeft));
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/gorilla.h b/src/engine/objects/gorilla.h
index dc4bad46f..4a9abf54d 100644
--- a/src/engine/objects/gorilla.h
+++ b/src/engine/objects/gorilla.h
@@ -22,7 +22,7 @@ class Gorilla final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Gorilla)
 
-  void update() override;
+  void updateLogic() override;
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
 
diff --git a/src/engine/objects/keyhole.cpp b/src/engine/objects/keyhole.cpp
index fa51fe2c0..94be0d68a 100644
--- a/src/engine/objects/keyhole.cpp
+++ b/src/engine/objects/keyhole.cpp
@@ -5,6 +5,7 @@
 #include "core/id.h"
 #include "core/units.h"
 #include "core/vec.h"
+#include "engine/engine.h"
 #include "engine/inventory.h"
 #include "engine/items_tr1.h"
 #include "engine/objectmanager.h"
@@ -76,11 +77,16 @@ void KeyHole::collide(CollisionInfo& /*collisionInfo*/)
   do
   {
     lara.setGoalAnimState(loader::file::LaraStateId::InsertKey);
-    lara.advanceFrame();
+    lara.advanceLaraFrame();
   } while(lara.getCurrentAnimState() != loader::file::LaraStateId::InsertKey);
 
   lara.setGoalAnimState(loader::file::LaraStateId::Stop);
   lara.setHandStatus(HandStatus::Grabbing);
   m_state.triggerState = TriggerState::Active;
 }
+
+void KeyHole::updateLogic()
+{
+  advanceFrame();
+}
 } // namespace engine::objects
diff --git a/src/engine/objects/keyhole.h b/src/engine/objects/keyhole.h
index d12be955b..1c21f3259 100644
--- a/src/engine/objects/keyhole.h
+++ b/src/engine/objects/keyhole.h
@@ -32,5 +32,7 @@ class KeyHole final : public ModelObject
   MODELOBJECT_DEFAULT_CONSTRUCTORS(KeyHole, false, false)
 
   void collide(CollisionInfo& collisionInfo) override;
+
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/kold.cpp b/src/engine/objects/kold.cpp
index eacee81fd..90ec45651 100644
--- a/src/engine/objects/kold.cpp
+++ b/src/engine/objects/kold.cpp
@@ -15,18 +15,18 @@
 #include "serialization/serialization.h"
 #include "util/helpers.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::objects
 {
-void Kold::update()
+void Kold::updateLogic()
 {
   activateAi();
 
-  core::Angle tiltRot = 0_deg;
-  core::Angle turn = 0_deg;
-  core::Angle headRot = 0_deg;
+  auto tiltRot = 0_deg;
+  auto turn = 0_deg;
+  auto headRot = 0_deg;
   if(alive())
   {
     const ai::EnemyLocation enemyLocation{*this};
@@ -110,7 +110,7 @@ void Kold::update()
   else if(m_state.current_anim_state != 5_as) // injured/dying
   {
     getSkeleton()->setAnim(
-      gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Kold)->animations[14]});
+      gsl_lite::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Kold)->animations[14]});
     m_state.current_anim_state = 5_as;
     getWorld().createPickup(TR1ItemId::ShotgunSprite, m_state.location.room, m_state.location.position);
   }
@@ -132,4 +132,4 @@ void Kold::deserialize(const serialization::Deserializer<world::World>& ser)
   AIAgent::deserialize(ser);
   ser(S_NV("shotAtLara", m_shotAtLara));
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/kold.h b/src/engine/objects/kold.h
index 083cd2b2a..bf7ab0d39 100644
--- a/src/engine/objects/kold.h
+++ b/src/engine/objects/kold.h
@@ -5,7 +5,7 @@
 #include "objectstate.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -30,22 +30,22 @@ namespace engine::objects
 class Kold final : public AIAgent
 {
 public:
-  Kold(const gsl::not_null<world::World*>& world, const Location& location)
+  Kold(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : AIAgent{world, location}
   {
   }
 
   Kold(const std::string& name,
-       const gsl::not_null<world::World*>& world,
-       const gsl::not_null<const world::Room*>& room,
+       const gsl_lite::not_null<world::World*>& world,
+       const gsl_lite::not_null<const world::Room*>& room,
        const loader::file::Item& item,
-       const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+       const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : AIAgent{name, world, room, item, animatedModel}
   {
     m_state.current_anim_state = 3_as;
   }
 
-  void update() override;
+  void updateLogic() override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
@@ -53,4 +53,4 @@ class Kold final : public AIAgent
 private:
   bool m_shotAtLara = false;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/laraobject.cpp b/src/engine/objects/laraobject.cpp
index d7342c339..60ee326d4 100644
--- a/src/engine/objects/laraobject.cpp
+++ b/src/engine/objects/laraobject.cpp
@@ -33,12 +33,14 @@
 #include "hid/actions.h"
 #include "hid/inputhandler.h"
 #include "loader/file/animation.h"
+#include "matrixstack.h"
 #include "modelobject.h"
 #include "object.h"
 #include "objectstate.h"
 #include "qs/quantity.h"
 #include "render/rendersettings.h"
 #include "render/scene/node.h"
+#include "segmentinterpolationmatrixstack.h"
 #include "serialization/objectreference.h"
 #include "serialization/optional.h"
 #include "serialization/quantity.h"
@@ -49,7 +51,6 @@
 #include <algorithm>
 #include <boost/assert.hpp>
 #include <boost/log/trivial.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <boost/throw_exception.hpp>
 #include <cmath>
 #include <cstddef>
@@ -62,12 +63,13 @@
 #include <glm/geometric.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <initializer_list>
 #include <limits>
 #include <memory>
 #include <optional>
+#include <ranges>
 #include <set>
 #include <stack>
 #include <stdexcept>
@@ -118,21 +120,21 @@ Location getUpperThirdBBoxCtr(const ModelObject& object)
 }
 } // namespace
 
-void LaraObject::setAnimation(AnimationId anim, const std::optional<core::Frame>& firstFrame)
+void LaraObject::setAnimation(const AnimationId anim, const std::optional<core::Frame>& firstFrame)
 {
   getSkeleton()->setAnimation(m_state.current_anim_state,
-                              gsl::not_null{&getWorld().getWorldGeometry().getAnimation(anim)},
+                              gsl_lite::not_null{&getWorld().getWorldGeometry().getAnimation(anim)},
                               firstFrame.value_or(0_frame));
 }
 
-void LaraObject::handleLaraStateOnLand()
+void LaraObject::handleLaraStateOnLand(const hid::InputHandler& inputHandler)
 {
   CollisionInfo collisionInfo;
   collisionInfo.initialPosition = m_state.location.position;
   collisionInfo.collisionRadius = core::DefaultCollisionRadius;
   collisionInfo.policies = CollisionInfo::SpazPushPolicy;
 
-  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl::not_null{this})->handleInput(collisionInfo);
+  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl_lite::not_null{this})->handleInput(collisionInfo);
 
   if(getWorld().getCameraController().getMode() != CameraMode::FreeLook)
   {
@@ -177,19 +179,19 @@ void LaraObject::handleLaraStateOnLand()
 
   m_state.rotation.Y += m_yRotationSpeed * 1_frame;
 
-  advanceFrame();
+  advanceLaraFrame();
 
   testInteractions(collisionInfo);
 
-  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl::not_null{this})->postprocessFrame(collisionInfo);
+  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl_lite::not_null{this})->postprocessFrame(collisionInfo);
 
   updateFloorHeight(-core::LaraWalkHeight / 2);
 
-  updateLarasWeaponsStatus();
+  updateLaraWeaponsStatus(inputHandler);
   getWorld().handleCommandSequence(collisionInfo.mid.floor.lastCommandSequenceOrDeath, false);
 
-  drawRoutine();
-  applyTransform();
+  updateLogicPose();
+  applyLogicTransform();
 }
 
 void LaraObject::smoothlyRevertHeadRotation() noexcept
@@ -204,7 +206,7 @@ void LaraObject::smoothlyRevertHeadRotation() noexcept
     m_headRotation.Y = 0_deg;
 }
 
-void LaraObject::handleLaraStateDiving()
+void LaraObject::handleLaraStateDiving(const hid::InputHandler& inputHandler)
 {
   CollisionInfo collisionInfo;
   collisionInfo.initialPosition = m_state.location.position;
@@ -213,7 +215,7 @@ void LaraObject::handleLaraStateDiving()
   collisionInfo.validCeilingHeightMin = core::LaraDiveHeight;
   collisionInfo.validFloorHeight = {-core::LaraDiveHeight, core::HeightLimit};
 
-  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl::not_null{this})->handleInput(collisionInfo);
+  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl_lite::not_null{this})->handleInput(collisionInfo);
 
   // "slowly" revert rotations to zero
   if(m_state.rotation.Z < -2_deg)
@@ -243,23 +245,23 @@ void LaraObject::handleLaraStateDiving()
   m_torsoRotation.X /= 2;
   m_torsoRotation.Y /= 2;
 
-  advanceFrame();
+  advanceLaraFrame();
 
   m_state.location.move(util::yawPitch(m_state.fallspeed * 1_frame / 4, m_state.rotation));
 
   testInteractions(collisionInfo);
 
-  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl::not_null{this})->postprocessFrame(collisionInfo);
+  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl_lite::not_null{this})->postprocessFrame(collisionInfo);
 
   updateFloorHeight(0_len);
-  updateLarasWeaponsStatus();
+  updateLaraWeaponsStatus(inputHandler);
   getWorld().handleCommandSequence(collisionInfo.mid.floor.lastCommandSequenceOrDeath, false);
 
-  drawRoutine();
-  applyTransform();
+  updateLogicPose();
+  applyLogicTransform();
 }
 
-void LaraObject::handleLaraStateSwimming()
+void LaraObject::handleLaraStateSwimming(const hid::InputHandler& inputHandler)
 {
   CollisionInfo collisionInfo;
   collisionInfo.initialPosition = m_state.location.position;
@@ -270,7 +272,7 @@ void LaraObject::handleLaraStateSwimming()
 
   getWorld().getCameraController().setRotationAroundLaraX(-22_deg);
 
-  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl::not_null{this})->handleInput(collisionInfo);
+  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl_lite::not_null{this})->handleInput(collisionInfo);
 
   // "slowly" revert rotations to zero
   if(m_state.rotation.Z < 0_deg)
@@ -298,20 +300,20 @@ void LaraObject::handleLaraStateSwimming()
     handleUnderwaterCurrent(collisionInfo);
   }
 
-  advanceFrame();
+  advanceLaraFrame();
 
   m_state.location.move(util::pitch(m_state.fallspeed * 1_frame / 4, getMovementAngle()).toRenderSystem());
 
   testInteractions(collisionInfo);
 
-  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl::not_null{this})->postprocessFrame(collisionInfo);
+  lara::AbstractStateHandler::create(getCurrentAnimState(), gsl_lite::not_null{this})->postprocessFrame(collisionInfo);
 
   updateFloorHeight(core::DefaultCollisionRadius);
-  updateLarasWeaponsStatus();
+  updateLaraWeaponsStatus(inputHandler);
   getWorld().handleCommandSequence(collisionInfo.mid.floor.lastCommandSequenceOrDeath, false);
 
-  drawRoutine();
-  applyTransform();
+  updateLogicPose();
+  applyLogicTransform();
 }
 
 void LaraObject::placeOnFloor(const CollisionInfo& collisionInfo) noexcept
@@ -321,33 +323,66 @@ void LaraObject::placeOnFloor(const CollisionInfo& collisionInfo) noexcept
 
 LaraObject::~LaraObject() = default;
 
-void LaraObject::update()
+void LaraObject::updatePrediction()
+{
+  m_state.predictedPosition = m_state.location.position;
+  m_state.predictedRotation = m_state.rotation;
+
+  switch(m_underwaterState)
+  {
+  case UnderwaterState::OnLand:
+    if(m_state.speed != 0_spd)
+    {
+      m_state.predictedPosition += util::pitch(m_state.speed * 1_frame, getMovementAngle());
+    }
+    if(m_state.falling && m_state.fallspeed != 0_spd)
+    {
+      m_state.predictedPosition.Y += m_state.fallspeed * 1_frame;
+    }
+
+    m_state.predictedRotation.Y += m_yRotationSpeed * 1_frame;
+    break;
+  case UnderwaterState::Diving:
+    m_state.predictedPosition += util::yawPitch(m_state.fallspeed * 1_frame / 4, m_state.rotation);
+    break;
+  case UnderwaterState::Swimming:
+    m_state.predictedPosition += util::pitch(m_state.fallspeed * 1_frame / 4, getMovementAngle());
+    break;
+  }
+}
+
+void LaraObject::updateLogic()
 {
   updateCheats();
 
-  if(getWorld().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::DrawPistols))
-    getWorld().getPlayer().getInventory().tryUse(*this, TR1ItemId::Pistols, getWorld().getEngine().getGameplayRules());
-  else if(getWorld().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::DrawShotgun))
-    getWorld().getPlayer().getInventory().tryUse(*this, TR1ItemId::Shotgun, getWorld().getEngine().getGameplayRules());
-  else if(getWorld().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::DrawUzis))
-    getWorld().getPlayer().getInventory().tryUse(*this, TR1ItemId::Uzis, getWorld().getEngine().getGameplayRules());
-  else if(getWorld().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::DrawMagnums))
-    getWorld().getPlayer().getInventory().tryUse(*this, TR1ItemId::Magnums, getWorld().getEngine().getGameplayRules());
-  else if(getWorld().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::ConsumeSmallMedipack))
+  const auto& inputHandler = getWorld().getEngine().getPresenter().getInputHandler();
+  if(inputHandler.hasDebouncedAction(hid::Action::DrawPistols))
+    getWorld().getPlayer().getInventory().tryUse(
+      *this, TR1ItemId::Pistols, getWorld().getEngine().getGameplayRules(), inputHandler);
+  else if(inputHandler.hasDebouncedAction(hid::Action::DrawShotgun))
+    getWorld().getPlayer().getInventory().tryUse(
+      *this, TR1ItemId::Shotgun, getWorld().getEngine().getGameplayRules(), inputHandler);
+  else if(inputHandler.hasDebouncedAction(hid::Action::DrawUzis))
+    getWorld().getPlayer().getInventory().tryUse(
+      *this, TR1ItemId::Uzis, getWorld().getEngine().getGameplayRules(), inputHandler);
+  else if(inputHandler.hasDebouncedAction(hid::Action::DrawMagnums))
+    getWorld().getPlayer().getInventory().tryUse(
+      *this, TR1ItemId::Magnums, getWorld().getEngine().getGameplayRules(), inputHandler);
+  else if(inputHandler.hasDebouncedAction(hid::Action::ConsumeSmallMedipack))
   {
     if(getWorld().getPlayer().getInventory().tryUse(
-         *this, TR1ItemId::SmallMedipack, getWorld().getEngine().getGameplayRules()))
+         *this, TR1ItemId::SmallMedipack, getWorld().getEngine().getGameplayRules(), inputHandler))
       ++getWorld().getPlayer().smallMedipacks;
   }
-  else if(getWorld().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::ConsumeLargeMedipack))
+  else if(inputHandler.hasDebouncedAction(hid::Action::ConsumeLargeMedipack))
   {
     if(getWorld().getPlayer().getInventory().tryUse(
-         *this, TR1ItemId::LargeMedipack, getWorld().getEngine().getGameplayRules()))
+         *this, TR1ItemId::LargeMedipack, getWorld().getEngine().getGameplayRules(), inputHandler))
       ++getWorld().getPlayer().largeMedipacks;
   }
 
 #ifndef NDEBUG
-  if(getWorld().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::CheatDive))
+  if(inputHandler.hasDebouncedAction(hid::Action::CheatDive))
     m_cheatDive = !m_cheatDive;
 #endif
 
@@ -363,14 +398,14 @@ void LaraObject::update()
     {
       m_state.rotation.X = -45_deg;
       setGoalAnimState(LaraStateId::UnderwaterDiving);
-      advanceFrame();
+      advanceLaraFrame();
       m_state.fallspeed *= 2;
     }
     else if(getCurrentAnimState() == LaraStateId::SwandiveEnd)
     {
       m_state.rotation.X = -85_deg;
       setGoalAnimState(LaraStateId::UnderwaterDiving);
-      advanceFrame();
+      advanceLaraFrame();
       m_state.fallspeed *= 2;
     }
     else
@@ -396,7 +431,7 @@ void LaraObject::update()
         surfaceLocation.position.Y = *waterSurfaceHeight;
         surfaceLocation.position.Z = m_state.location.position.Z;
 
-        auto particle = gsl::make_shared<SplashParticle>(surfaceLocation, getWorld(), false);
+        const auto particle = gsl_lite::make_shared<SplashParticle>(surfaceLocation, getWorld(), false);
         setParent(particle, surfaceLocation.room->node);
         getWorld().getObjectManager().registerParticle(particle);
       }
@@ -404,7 +439,7 @@ void LaraObject::update()
   }
   else if(m_underwaterState == UnderwaterState::Diving && !(m_cheatDive || m_state.location.room->isWaterRoom))
   {
-    auto waterSurfaceHeight = getWaterSurfaceHeight();
+    const auto waterSurfaceHeight = getWaterSurfaceHeight();
     m_state.fallspeed = 0_spd;
     m_state.rotation.X = 0_deg;
     m_state.rotation.Z = 0_deg;
@@ -454,8 +489,8 @@ void LaraObject::update()
     auto bubbleCount = util::rand15(2);
     while(bubbleCount-- > 0)
     {
-      auto particle
-        = gsl::make_shared<BubbleParticle>(Location{m_state.location.room, position}, getWorld(), false, true);
+      const auto particle
+        = gsl_lite::make_shared<BubbleParticle>(Location{m_state.location.room, position}, getWorld(), false, true);
       setParent(particle, nullptr);
       particle->scale = util::rand15(0.8f) + 0.2f;
       m_state.location.room->particles.registerParticle(particle);
@@ -466,7 +501,7 @@ void LaraObject::update()
   {
   case UnderwaterState::OnLand:
     m_air = core::LaraAir;
-    handleLaraStateOnLand();
+    handleLaraStateOnLand(inputHandler);
     break;
   case UnderwaterState::Diving:
     if(!isDead() && !m_cheatDive)
@@ -478,19 +513,19 @@ void LaraObject::update()
         m_state.health -= 5_hp;
       }
     }
-    handleLaraStateDiving();
+    handleLaraStateDiving(inputHandler);
     break;
   case UnderwaterState::Swimming:
     if(!isDead())
     {
       m_air = std::min(m_air + core::FrameRate * 1_sec / 3, core::LaraAir);
     }
-    handleLaraStateSwimming();
+    handleLaraStateSwimming(inputHandler);
     break;
   }
 }
 
-void LaraObject::advanceFrame()
+void LaraObject::advanceLaraFrame()
 {
   const auto endOfAnim = getSkeleton()->advanceFrame(m_state);
 
@@ -529,7 +564,7 @@ void LaraObject::advanceFrame()
         case AnimCommandOpcode::EmptyHands:
           setHandStatus(HandStatus::None);
           break;
-          // NOLINTNEXTLINE(bugprone-branch-clone)
+        // NOLINTNEXTLINE(bugprone-branch-clone)
         case AnimCommandOpcode::PlaySound:
           cmd += 2;
           break;
@@ -543,7 +578,7 @@ void LaraObject::advanceFrame()
     }
 
     getSkeleton()->setAnimation(m_state.current_anim_state,
-                                gsl::not_null{getSkeleton()->getAnim()->nextAnimation},
+                                gsl_lite::not_null{getSkeleton()->getAnim()->nextAnimation},
                                 getSkeleton()->getAnim()->nextFrame);
   }
 
@@ -573,7 +608,7 @@ void LaraObject::advanceFrame()
       case AnimCommandOpcode::PlayEffect:
         if(getSkeleton()->getFrame().get() == cmd[0])
         {
-          BOOST_LOG_TRIVIAL(debug) << "Anim effect: " << int(cmd[1]);
+          BOOST_LOG_TRIVIAL(debug) << "Anim effect: " << static_cast<int>(cmd[1]);
           getWorld().runEffect(cmd[1], this);
         }
         cmd += 2;
@@ -608,7 +643,7 @@ void LaraObject::testInteractions(CollisionInfo& collisionInfo)
   if(isDead())
     return;
 
-  std::set<gsl::not_null<const world::Room*>> rooms;
+  std::set<gsl_lite::not_null<const world::Room*>> rooms;
   rooms.insert(m_state.location.room);
   for(const world::Portal& p : m_state.location.room->portals)
     rooms.insert(p.adjoiningRoom);
@@ -620,11 +655,11 @@ void LaraObject::testInteractions(CollisionInfo& collisionInfo)
       if(!object->m_state.collidable || object->m_state.triggerState == TriggerState::Invisible)
         continue;
 
-      if(rooms.find(object->m_state.location.room) == rooms.end())
+      if(!rooms.contains(object->m_state.location.room))
         continue;
 
-      const auto d = m_state.location.position - object->m_state.location.position;
-      if(abs(d.X) >= 4_sectors || abs(d.Y) >= 4_sectors || abs(d.Z) >= 4_sectors)
+      if(const auto d = m_state.location.position - object->m_state.location.position;
+         abs(d.X) >= 4_sectors || abs(d.Y) >= 4_sectors || abs(d.Z) >= 4_sectors)
         continue;
 
       object->collide(collisionInfo);
@@ -632,7 +667,7 @@ void LaraObject::testInteractions(CollisionInfo& collisionInfo)
   };
 
   auto& objectManager = getWorld().getObjectManager();
-  execCollisions(objectManager.getObjects() | boost::adaptors::map_values);
+  execCollisions(objectManager.getObjects() | std::views::values);
   execCollisions(objectManager.getDynamicObjects());
 
   auto& lara = objectManager.getLara();
@@ -654,7 +689,7 @@ void LaraObject::handleUnderwaterCurrent(CollisionInfo& collisionInfo)
   core::TRVec targetPos;
   if(const auto box = m_state.tryGetCurrentBox();
      box == nullptr
-     || !m_underwaterRoute.calculateTarget(getWorld(), targetPos, m_state.location.position, gsl::not_null{box}))
+     || !m_underwaterRoute.calculateTarget(getWorld(), targetPos, m_state.location.position, gsl_lite::not_null{box}))
     return;
 
   targetPos -= m_state.location.position;
@@ -702,7 +737,7 @@ void LaraObject::handleUnderwaterCurrent(CollisionInfo& collisionInfo)
   collisionInfo.initialPosition = m_state.location.position;
 }
 
-void LaraObject::updateLarasWeaponsStatus()
+void LaraObject::updateLaraWeaponsStatus(const hid::InputHandler& inputHandler)
 {
   if(leftArm.flashTimeout > 0_frame)
   {
@@ -731,8 +766,7 @@ void LaraObject::updateLarasWeaponsStatus()
     }
     else if(player.requestedWeaponType == player.selectedWeaponType)
     {
-      if(getWorld().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Holster)
-         && player.selectedWeaponType != WeaponType::None
+      if(inputHandler.hasDebouncedAction(hid::Action::Holster) && player.selectedWeaponType != WeaponType::None
          && getWorld().getPlayer().getInventory().count(
               getWorld().getPlayer().getInventory().getAmmo(player.selectedWeaponType).weaponType)
               > 0)
@@ -834,7 +868,7 @@ void LaraObject::updateLarasWeaponsStatus()
     case WeaponType::Pistols:
       if(getWorld().getPlayer().getInventory().getAmmo(WeaponType::Pistols).shots != 0)
       {
-        if(getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+        if(inputHandler.hasAction(hid::Action::Action))
         {
           const auto& uziLara = *getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::LaraUzisAnim);
           BOOST_ASSERT(uziLara.bones.size() == getSkeleton()->getBoneCount());
@@ -846,12 +880,12 @@ void LaraObject::updateLarasWeaponsStatus()
       {
         getWorld().getCameraController().setMode(CameraMode::Combat);
       }
-      updateTwoWeapons(getWorld().getPlayer().selectedWeaponType);
+      updateTwoWeapons(getWorld().getPlayer().selectedWeaponType, inputHandler);
       break;
     case WeaponType::Magnums:
       if(getWorld().getPlayer().getInventory().getAmmo(WeaponType::Magnums).shots != 0)
       {
-        if(getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+        if(inputHandler.hasAction(hid::Action::Action))
         {
           const auto& uziLara = *getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::LaraUzisAnim);
           BOOST_ASSERT(uziLara.bones.size() == getSkeleton()->getBoneCount());
@@ -863,12 +897,12 @@ void LaraObject::updateLarasWeaponsStatus()
       {
         getWorld().getCameraController().setMode(CameraMode::Combat);
       }
-      updateTwoWeapons(getWorld().getPlayer().selectedWeaponType);
+      updateTwoWeapons(getWorld().getPlayer().selectedWeaponType, inputHandler);
       break;
     case WeaponType::Uzis:
       if(getWorld().getPlayer().getInventory().getAmmo(WeaponType::Uzis).shots != 0)
       {
-        if(getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+        if(inputHandler.hasAction(hid::Action::Action))
         {
           const auto& uziLara = *getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::LaraUzisAnim);
           BOOST_ASSERT(uziLara.bones.size() == getSkeleton()->getBoneCount());
@@ -880,12 +914,12 @@ void LaraObject::updateLarasWeaponsStatus()
       {
         getWorld().getCameraController().setMode(CameraMode::Combat);
       }
-      updateTwoWeapons(getWorld().getPlayer().selectedWeaponType);
+      updateTwoWeapons(getWorld().getPlayer().selectedWeaponType, inputHandler);
       break;
     case WeaponType::Shotgun:
       if(getWorld().getPlayer().getInventory().getAmmo(WeaponType::Shotgun).shots != 0)
       {
-        if(getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+        if(inputHandler.hasAction(hid::Action::Action))
         {
           const auto& uziLara = *getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::LaraUzisAnim);
           BOOST_ASSERT(uziLara.bones.size() == getSkeleton()->getBoneCount());
@@ -897,7 +931,7 @@ void LaraObject::updateLarasWeaponsStatus()
       {
         getWorld().getCameraController().setMode(CameraMode::Combat);
       }
-      updateShotgun();
+      updateShotgun(inputHandler);
       break;
     default:
       break;
@@ -910,9 +944,9 @@ void LaraObject::updateLarasWeaponsStatus()
   }
 }
 
-void LaraObject::updateShotgun()
+void LaraObject::updateShotgun(const hid::InputHandler& inputHandler)
 {
-  if(getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+  if(inputHandler.hasAction(hid::Action::Action))
   {
     updateAimingState(Weapon::get(WeaponType::Shotgun));
   }
@@ -932,13 +966,13 @@ void LaraObject::updateShotgun()
     m_headRotation.X = 0_deg;
     m_headRotation.Y = 0_deg;
   }
-  updateAnimShotgun();
+  updateAnimShotgun(inputHandler);
 }
 
-void LaraObject::updateTwoWeapons(WeaponType weaponType)
+void LaraObject::updateTwoWeapons(const WeaponType weaponType, const hid::InputHandler& inputHandler)
 {
   const auto& weapon = Weapon::get(weaponType);
-  if(getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action))
+  if(inputHandler.hasAction(hid::Action::Action))
   {
     updateAimingState(weapon);
   }
@@ -968,7 +1002,7 @@ void LaraObject::updateTwoWeapons(WeaponType weaponType)
     m_headRotation.X = m_torsoRotation.X = (leftArm.aimRotation.X + rightArm.aimRotation.X) / 4;
   }
 
-  updateAnimTwoWeapons(weaponType);
+  updateAnimTwoWeapons(weaponType, inputHandler);
 }
 
 void LaraObject::updateAimingState(const Weapon& weapon)
@@ -1043,7 +1077,7 @@ void LaraObject::initWeaponAnimData()
   }
 }
 
-void LaraObject::drawTwoWeapons(WeaponType weaponType)
+void LaraObject::drawTwoWeapons(const WeaponType weaponType)
 {
   auto nextFrame = leftArm.frame + 1_frame;
   if(nextFrame < DrawTwoWeaponsAnimStart || nextFrame > DrawTwoWeaponsAnimEnd)
@@ -1072,7 +1106,7 @@ void LaraObject::findTarget(const Weapon& weapon)
   weaponLocation.position.Y -= weapon.weaponHeight;
   aimAt.reset();
   core::Angle bestYAngle{std::numeric_limits<core::Angle::type>::max()};
-  for(const auto& currentEnemy : getWorld().getObjectManager().getObjects() | boost::adaptors::map_values)
+  for(const auto& currentEnemy : getWorld().getObjectManager().getObjects() | std::views::values)
   {
     if(currentEnemy->m_state.isDead() || currentEnemy.get() == getWorld().getObjectManager().getLaraPtr())
       continue;
@@ -1202,9 +1236,9 @@ void LaraObject::drawShotgun()
   leftArm.frame = rightArm.frame = nextFrame;
 }
 
-void LaraObject::updateAnimShotgun()
+void LaraObject::updateAnimShotgun(const hid::InputHandler& inputHandler)
 {
-  leftArm.updateAnimShotgun(*this);
+  leftArm.updateAnimShotgun(*this, inputHandler);
   rightArm.frame = leftArm.frame;
 }
 
@@ -1242,7 +1276,7 @@ void LaraObject::holsterShotgun()
   m_headRotation.Y = 0_deg;
 }
 
-void LaraObject::holsterTwoWeapons(WeaponType weaponType)
+void LaraObject::holsterTwoWeapons(const WeaponType weaponType)
 {
   leftArm.holsterTwoWeapons(*this, weaponType);
   rightArm.holsterTwoWeapons(*this, weaponType);
@@ -1263,12 +1297,12 @@ void LaraObject::holsterTwoWeapons(WeaponType weaponType)
   m_torsoRotation.Y = rightArm.aimRotation.Y / 4;
 }
 
-void LaraObject::updateAnimTwoWeapons(const WeaponType weaponType)
+void LaraObject::updateAnimTwoWeapons(const WeaponType weaponType, const hid::InputHandler& inputHandler)
 {
   const auto& weapon = Weapon::get(weaponType);
 
-  rightArm.updateAnimTwoWeapons(*this, weapon);
-  leftArm.updateAnimTwoWeapons(*this, weapon);
+  rightArm.updateAnimTwoWeapons(*this, weapon, inputHandler);
+  leftArm.updateAnimTwoWeapons(*this, weapon, inputHandler);
 }
 
 bool LaraObject::tryShootShot(const WeaponType weaponType,
@@ -1361,7 +1395,7 @@ void LaraObject::hitTarget(ModelObject& object, const core::TRVec& hitPos, const
   }
   object.m_state.is_hit = true;
   object.m_state.health -= damage;
-  auto fx = createBloodSplat(
+  const auto fx = createBloodSplat(
     getWorld(), Location{object.m_state.location.room, hitPos}, object.m_state.speed, object.m_state.rotation.Y);
   getWorld().getObjectManager().registerParticle(fx);
   if(object.m_state.isDead())
@@ -1396,262 +1430,37 @@ void LaraObject::hitTarget(ModelObject& object, const core::TRVec& hitPos, const
   object.playSoundEffect(soundEffect);
 }
 
-namespace
+std::vector<glm::mat4> LaraObject::calcPoseMatrices(const world::SkeletalModelType& objInfo,
+                                                    const loader::file::AnimFrame& frame) const
 {
-class MatrixStack
-{
-private:
-  std::stack<glm::mat4> m_stack;
-
-public:
-  explicit MatrixStack()
-  {
-    m_stack.emplace(1.0f);
-  }
-
-  void push()
-  {
-    const auto top = m_stack.top();
-    m_stack.emplace(top);
-  }
-
-  void pop() noexcept
-  {
-    m_stack.pop();
-  }
-
-  [[nodiscard]] const glm::mat4& top() const noexcept
-  {
-    return m_stack.top();
-  }
-
-  glm::mat4& top() noexcept
-  {
-    return m_stack.top();
-  }
-
-  void rotate(const glm::mat4& m)
-  {
-    m_stack.top() *= m;
-  }
-
-  void rotate(const core::TRRotation& r)
-  {
-    rotate(r.toMatrix());
-  }
-
-  void rotate(const core::TRRotationXY& r)
-  {
-    rotate(r.toMatrix());
-  }
-
-  void resetRotation()
-  {
-    top()[0] = glm::vec4{1, 0, 0, 0};
-    top()[1] = glm::vec4{0, 1, 0, 0};
-    top()[2] = glm::vec4{0, 0, 1, 0};
-  }
-
-  void rotate(const uint8_t* packed)
-  {
-    m_stack.top() *= core::fromPackedAngles(packed);
-  }
-
-  void translate(const glm::vec3& c)
-  {
-    m_stack.top() = glm::translate(m_stack.top(), c);
-  }
-
-  void transform(const std::initializer_list<size_t>& indices,
-                 const std::vector<world::SkeletalModelType::Bone>& bones,
-                 const gsl::span<const uint8_t>& angleData,
-                 const std::shared_ptr<SkeletalModelNode>& skeleton)
-  {
-    for(auto idx : indices)
-      transform(idx, bones, angleData, skeleton);
-  }
-
-  void transform(const size_t idx,
-                 const std::vector<world::SkeletalModelType::Bone>& bones,
-                 const gsl::span<const uint8_t>& angleData,
-                 const std::shared_ptr<SkeletalModelNode>& skeleton)
-  {
-    BOOST_ASSERT(idx > 0);
-    translate(bones.at(idx).position);
-    rotate(&angleData[sizeof(uint32_t) * idx]);
-    apply(skeleton, idx);
-  }
-
-  void apply(const std::shared_ptr<SkeletalModelNode>& skeleton, const size_t idx)
-  {
-    BOOST_ASSERT(skeleton != nullptr);
-    skeleton->setPoseMatrix(idx, m_stack.top());
-  }
-};
-
-class DualMatrixStack
-{
-private:
-  MatrixStack m_stack1;
-  MatrixStack m_stack2;
-  float m_bias;
-
-public:
-  explicit DualMatrixStack(const float bias)
-      : m_bias{bias}
-  {
-  }
-
-  void push()
-  {
-    m_stack1.push();
-    m_stack2.push();
-  }
-
-  void pop()
-  {
-    m_stack1.pop();
-    m_stack2.pop();
-  }
-
-  [[nodiscard]] glm::mat4 itop() const
-  {
-    return util::mix(m_stack1.top(), m_stack2.top(), m_bias);
-  }
-
-  void rotate(const glm::mat4& m)
-  {
-    m_stack1.top() *= m;
-    m_stack2.top() *= m;
-  }
-
-  void rotate(const core::TRRotation& r)
-  {
-    rotate(r.toMatrix());
-  }
-
-  void rotate(const core::TRRotationXY& r)
-  {
-    rotate(r.toMatrix());
-  }
-
-  void rotate(const uint8_t* packed1, const uint8_t* packed2)
-  {
-    m_stack1.top() *= core::fromPackedAngles(packed1);
-    m_stack2.top() *= core::fromPackedAngles(packed2);
-  }
-
-  void resetRotation()
-  {
-    m_stack1.resetRotation();
-    m_stack2.resetRotation();
-  }
-
-  void translate(const glm::vec3& v1, const glm::vec3& v2)
-  {
-    m_stack1.top() = glm::translate(m_stack1.top(), v1);
-    m_stack2.top() = glm::translate(m_stack2.top(), v2);
-  }
-
-  void translate(const glm::vec3& v)
-  {
-    translate(v, v);
-  }
-
-  void transform(const std::initializer_list<size_t>& indices,
-                 const std::vector<world::SkeletalModelType::Bone>& bones,
-                 const gsl::span<const uint8_t>& angleData1,
-                 const gsl::span<const uint8_t>& angleData2,
-                 const std::shared_ptr<SkeletalModelNode>& skeleton)
-  {
-    for(auto idx : indices)
-      transform(idx, bones, angleData1, angleData2, skeleton);
-  }
-
-  void transform(const size_t idx,
-                 const std::vector<world::SkeletalModelType::Bone>& bones,
-                 const gsl::span<const uint8_t>& angleData1,
-                 const gsl::span<const uint8_t>& angleData2,
-                 const std::shared_ptr<SkeletalModelNode>& skeleton)
-  {
-    BOOST_ASSERT(idx > 0);
-    translate(bones.at(idx).position);
-    rotate(&angleData1[sizeof(uint32_t) * idx], &angleData2[sizeof(uint32_t) * idx]);
-    apply(skeleton, idx);
-  }
-
-  // NOLINTNEXTLINE(readability-make-member-function-const)
-  void apply(const std::shared_ptr<SkeletalModelNode>& skeleton, const size_t idx)
-  {
-    BOOST_ASSERT(skeleton != nullptr);
-    skeleton->setPoseMatrix(idx, itop());
-  }
-};
-} // namespace
-
-void LaraObject::drawRoutine()
-{
-  const auto interpolationInfo = getSkeleton()->getInterpolationInfo();
-  if(!hit_direction.has_value() && interpolationInfo.firstFrame != interpolationInfo.secondFrame)
-  {
-    drawRoutineInterpolated(interpolationInfo);
-    return;
-  }
-
-  const auto& objInfo = *getWorld().getWorldGeometry().findAnimatedModelForType(m_state.type);
-  const loader::file::AnimFrame* frame;
-  if(!hit_direction.has_value())
-  {
-    frame = interpolationInfo.firstFrame;
-  }
-  else
-  {
-    switch(*hit_direction)
-    {
-    case core::Axis::PosX:
-      frame = getWorld().getWorldGeometry().getAnimation(AnimationId::AH_LEFT).frames;
-      break;
-    case core::Axis::NegZ:
-      frame = getWorld().getWorldGeometry().getAnimation(AnimationId::AH_BACKWARD).frames;
-      break;
-    case core::Axis::NegX:
-      frame = getWorld().getWorldGeometry().getAnimation(AnimationId::AH_RIGHT).frames;
-      break;
-    default:
-      frame = getWorld().getWorldGeometry().getAnimation(AnimationId::AH_FORWARD).frames;
-      break;
-    }
-    frame = frame->next(hit_frame.get());
-  }
-
+  const auto angleData = frame.getAngleData();
   MatrixStack matrixStack;
 
   matrixStack.push();
-  matrixStack.translate(frame->pos.toGl());
-  const auto angleData = frame->getAngleData();
+  matrixStack.translate(frame.pos.toGl());
   matrixStack.rotate(&angleData[sizeof(uint32_t) * BoneHips]);
-  matrixStack.apply(getSkeleton(), BoneHips);
+  matrixStack.apply(BoneHips);
 
   matrixStack.push();
-  matrixStack.transform({BoneThighR, BoneCalfR, BoneFootR}, objInfo.bones, angleData, getSkeleton());
+  matrixStack.transform({BoneThighR, BoneCalfR, BoneFootR}, objInfo.bones, angleData);
 
   matrixStack.pop();
   matrixStack.push();
-  matrixStack.transform({BoneThighL, BoneCalfL, BoneFootL}, objInfo.bones, angleData, getSkeleton());
+  matrixStack.transform({BoneThighL, BoneCalfL, BoneFootL}, objInfo.bones, angleData);
 
   matrixStack.pop();
   matrixStack.translate(objInfo.bones[BoneTorso].position);
   matrixStack.rotate(&angleData[sizeof(uint32_t) * BoneTorso]);
   matrixStack.rotate(m_torsoRotation);
-  matrixStack.apply(getSkeleton(), BoneTorso);
+  matrixStack.apply(BoneTorso);
 
   matrixStack.push();
   matrixStack.translate(objInfo.bones[BoneHead].position);
   matrixStack.rotate(&angleData[sizeof(uint32_t) * BoneHead]);
   matrixStack.rotate(m_headRotation);
-  matrixStack.apply(getSkeleton(), BoneHead);
+  matrixStack.apply(BoneHead);
 
-  WeaponType activeWeaponType = WeaponType::None;
+  auto activeWeaponType = WeaponType::None;
   if(m_handStatus == HandStatus::Combat || m_handStatus == HandStatus::DrawWeapon
      || m_handStatus == HandStatus::Holster)
   {
@@ -1659,16 +1468,16 @@ void LaraObject::drawRoutine()
   }
 
   matrixStack.pop();
-  gsl::span<const uint8_t> armAngleData;
+  gsl_lite::span<const uint8_t> armAngleData;
   switch(activeWeaponType)
   {
   case WeaponType::None:
     matrixStack.push();
-    matrixStack.transform({BoneArmL, BoneForeArmL, BoneHandL}, objInfo.bones, angleData, getSkeleton());
+    matrixStack.transform({BoneArmL, BoneForeArmL, BoneHandL}, objInfo.bones, angleData);
 
     matrixStack.pop();
     matrixStack.push();
-    matrixStack.transform({BoneArmR, BoneForeArmR, BoneHandR}, objInfo.bones, angleData, getSkeleton());
+    matrixStack.transform({BoneArmR, BoneForeArmR, BoneHandR}, objInfo.bones, angleData);
 
     m_muzzleFlashLeft->setVisible(false);
     m_muzzleFlashRight->setVisible(false);
@@ -1683,10 +1492,10 @@ void LaraObject::drawRoutine()
 
     armAngleData = rightArm.weaponAnimData->next(rightArm.frame.get())->getAngleData();
     matrixStack.rotate(&armAngleData[sizeof(uint32_t) * BoneArmL]);
-    matrixStack.apply(getSkeleton(), BoneArmL);
+    matrixStack.apply(BoneArmL);
 
-    matrixStack.transform(BoneForeArmL, objInfo.bones, armAngleData, getSkeleton());
-    matrixStack.transform(BoneHandL, objInfo.bones, armAngleData, getSkeleton());
+    matrixStack.transform(BoneForeArmL, objInfo.bones, armAngleData);
+    matrixStack.transform(BoneHandL, objInfo.bones, armAngleData);
 
     renderMuzzleFlash(activeWeaponType, matrixStack.top(), m_muzzleFlashRight, rightArm.flashTimeout != 0_frame);
     matrixStack.pop();
@@ -1696,62 +1505,63 @@ void LaraObject::drawRoutine()
     matrixStack.rotate(leftArm.aimRotation);
     armAngleData = leftArm.weaponAnimData->next(leftArm.frame.get())->getAngleData();
     matrixStack.rotate(&armAngleData[sizeof(uint32_t) * BoneArmR]);
-    matrixStack.apply(getSkeleton(), BoneArmR);
+    matrixStack.apply(BoneArmR);
 
-    matrixStack.transform({BoneForeArmR, BoneHandR}, objInfo.bones, armAngleData, getSkeleton());
+    matrixStack.transform({BoneForeArmR, BoneHandR}, objInfo.bones, armAngleData);
 
     renderMuzzleFlash(activeWeaponType, matrixStack.top(), m_muzzleFlashLeft, leftArm.flashTimeout != 0_frame);
     break;
   case WeaponType::Shotgun:
     matrixStack.push();
     armAngleData = rightArm.weaponAnimData->next(rightArm.frame.get())->getAngleData();
-    matrixStack.transform({BoneArmL, BoneForeArmL, BoneHandL}, objInfo.bones, armAngleData, getSkeleton());
+    matrixStack.transform({BoneArmL, BoneForeArmL, BoneHandL}, objInfo.bones, armAngleData);
 
     matrixStack.pop();
     matrixStack.push();
     armAngleData = leftArm.weaponAnimData->next(leftArm.frame.get())->getAngleData();
-    matrixStack.transform({BoneArmR, BoneForeArmR, BoneHandR}, objInfo.bones, armAngleData, getSkeleton());
+    matrixStack.transform({BoneArmR, BoneForeArmR, BoneHandR}, objInfo.bones, armAngleData);
     break;
   default:
     break;
   }
 
-  updateMuzzleFlashLightPosStrength();
+  return matrixStack.getPoseMatrices();
 }
 
-void LaraObject::drawRoutineInterpolated(const InterpolationInfo& interpolationInfo)
+std::vector<glm::mat4>
+  LaraObject::calcPoseMatricesInterpolated(const world::SkeletalModelType& objInfo,
+                                           const AnimSegmentInterpolationInfo& interpolationInfo) const
 {
-  const auto& objInfo = *getWorld().getWorldGeometry().findAnimatedModelForType(m_state.type);
+  const auto angleDataA = interpolationInfo.firstFrame->getAngleData();
+  const auto angleDataB = interpolationInfo.secondFrame->getAngleData();
 
-  DualMatrixStack matrixStack{interpolationInfo.bias};
+  SegmentInterpolationMatrixStack matrixStack{interpolationInfo.interKeyframeFactor};
 
   matrixStack.push();
   matrixStack.translate(interpolationInfo.firstFrame->pos.toGl(), interpolationInfo.secondFrame->pos.toGl());
-  const auto angleDataA = interpolationInfo.firstFrame->getAngleData();
-  const auto angleDataB = interpolationInfo.secondFrame->getAngleData();
   matrixStack.rotate(&angleDataA[sizeof(uint32_t) * BoneHips], &angleDataB[sizeof(uint32_t) * BoneHips]);
-  matrixStack.apply(getSkeleton(), 0);
+  matrixStack.apply(BoneHips);
 
   matrixStack.push();
-  matrixStack.transform({BoneThighR, BoneCalfR, BoneFootR}, objInfo.bones, angleDataA, angleDataB, getSkeleton());
+  matrixStack.transform({BoneThighR, BoneCalfR, BoneFootR}, objInfo.bones, angleDataA, angleDataB);
 
   matrixStack.pop();
   matrixStack.push();
-  matrixStack.transform({BoneThighL, BoneCalfL, BoneFootL}, objInfo.bones, angleDataA, angleDataB, getSkeleton());
+  matrixStack.transform({BoneThighL, BoneCalfL, BoneFootL}, objInfo.bones, angleDataA, angleDataB);
 
   matrixStack.pop();
   matrixStack.translate(objInfo.bones[BoneTorso].position);
   matrixStack.rotate(&angleDataA[sizeof(uint32_t) * BoneTorso], &angleDataB[sizeof(uint32_t) * BoneTorso]);
   matrixStack.rotate(m_torsoRotation);
-  matrixStack.apply(getSkeleton(), BoneTorso);
+  matrixStack.apply(BoneTorso);
 
   matrixStack.push();
-  matrixStack.translate(objInfo.bones[14].position);
+  matrixStack.translate(objInfo.bones[BoneHead].position);
   matrixStack.rotate(&angleDataA[sizeof(uint32_t) * BoneHead], &angleDataB[sizeof(uint32_t) * BoneHead]);
   matrixStack.rotate(m_headRotation);
-  matrixStack.apply(getSkeleton(), BoneHead);
+  matrixStack.apply(BoneHead);
 
-  WeaponType activeWeaponType = WeaponType::None;
+  auto activeWeaponType = WeaponType::None;
   if(m_handStatus == HandStatus::Combat || m_handStatus == HandStatus::DrawWeapon
      || m_handStatus == HandStatus::Holster)
   {
@@ -1759,16 +1569,16 @@ void LaraObject::drawRoutineInterpolated(const InterpolationInfo& interpolationI
   }
 
   matrixStack.pop();
-  gsl::span<const uint8_t> armAngleData;
+  gsl_lite::span<const uint8_t> armAngleData;
   switch(activeWeaponType)
   {
   case WeaponType::None:
     matrixStack.push();
-    matrixStack.transform({BoneArmL, BoneForeArmL, BoneHandL}, objInfo.bones, angleDataA, angleDataB, getSkeleton());
+    matrixStack.transform({BoneArmL, BoneForeArmL, BoneHandL}, objInfo.bones, angleDataA, angleDataB);
 
     matrixStack.pop();
     matrixStack.push();
-    matrixStack.transform({BoneArmR, BoneForeArmR, BoneHandR}, objInfo.bones, angleDataA, angleDataB, getSkeleton());
+    matrixStack.transform({BoneArmR, BoneForeArmR, BoneHandR}, objInfo.bones, angleDataA, angleDataB);
 
     m_muzzleFlashLeft->setVisible(false);
     m_muzzleFlashRight->setVisible(false);
@@ -1777,47 +1587,114 @@ void LaraObject::drawRoutineInterpolated(const InterpolationInfo& interpolationI
   case WeaponType::Magnums:
   case WeaponType::Uzis:
     matrixStack.push();
-    matrixStack.translate(objInfo.bones[8].position);
+    matrixStack.translate(objInfo.bones[BoneArmL].position);
     matrixStack.resetRotation();
     matrixStack.rotate(rightArm.aimRotation);
 
     armAngleData = rightArm.weaponAnimData->next(rightArm.frame.get())->getAngleData();
     matrixStack.rotate(&armAngleData[sizeof(uint32_t) * BoneArmL], &armAngleData[sizeof(uint32_t) * BoneArmL]);
-    matrixStack.apply(getSkeleton(), BoneArmL);
+    matrixStack.apply(BoneArmL);
 
-    matrixStack.transform(BoneForeArmL, objInfo.bones, armAngleData, armAngleData, getSkeleton());
-    matrixStack.transform(BoneHandL, objInfo.bones, armAngleData, armAngleData, getSkeleton());
+    matrixStack.transform(BoneForeArmL, objInfo.bones, armAngleData, armAngleData);
+    matrixStack.transform(BoneHandL, objInfo.bones, armAngleData, armAngleData);
 
     renderMuzzleFlash(activeWeaponType, matrixStack.itop(), m_muzzleFlashRight, rightArm.flashTimeout != 0_frame);
     matrixStack.pop();
     matrixStack.push();
-    matrixStack.translate(objInfo.bones[11].position);
+    matrixStack.translate(objInfo.bones[BoneArmR].position);
     matrixStack.resetRotation();
     matrixStack.rotate(leftArm.aimRotation);
     armAngleData = leftArm.weaponAnimData->next(leftArm.frame.get())->getAngleData();
     matrixStack.rotate(&armAngleData[sizeof(uint32_t) * BoneArmR], &armAngleData[sizeof(uint32_t) * BoneArmR]);
-    matrixStack.apply(getSkeleton(), BoneArmR);
+    matrixStack.apply(BoneArmR);
 
-    matrixStack.transform({BoneForeArmR, BoneHandR}, objInfo.bones, armAngleData, armAngleData, getSkeleton());
+    matrixStack.transform({BoneForeArmR, BoneHandR}, objInfo.bones, armAngleData, armAngleData);
 
     renderMuzzleFlash(activeWeaponType, matrixStack.itop(), m_muzzleFlashLeft, leftArm.flashTimeout != 0_frame);
     break;
   case WeaponType::Shotgun:
     matrixStack.push();
     armAngleData = rightArm.weaponAnimData->next(rightArm.frame.get())->getAngleData();
-    matrixStack.transform(
-      {BoneArmL, BoneForeArmL, BoneHandL}, objInfo.bones, armAngleData, armAngleData, getSkeleton());
+    matrixStack.transform({BoneArmL, BoneForeArmL, BoneHandL}, objInfo.bones, armAngleData, armAngleData);
 
     matrixStack.pop();
     matrixStack.push();
     armAngleData = leftArm.weaponAnimData->next(leftArm.frame.get())->getAngleData();
-    matrixStack.transform(
-      {BoneArmR, BoneForeArmR, BoneHandR}, objInfo.bones, armAngleData, armAngleData, getSkeleton());
+    matrixStack.transform({BoneArmR, BoneForeArmR, BoneHandR}, objInfo.bones, armAngleData, armAngleData);
     break;
   default:
     break;
   }
 
+  return matrixStack.getPoseMatrices();
+}
+
+void LaraObject::updateLogicPose()
+{
+  const auto interpolationInfo = getSkeleton()->getInterpolationInfo();
+  const auto nextInterpolationInfo = getSkeleton()->getNextInterpolationInfo();
+  const auto& objInfo = *getWorld().getWorldGeometry().findAnimatedModelForType(m_state.type);
+  const loader::file::AnimFrame* frame;
+  const loader::file::AnimFrame* nextFrame;
+
+  if(hit_direction.has_value())
+  {
+    switch(*hit_direction)
+    {
+    case core::Axis::PosX:
+      frame = getWorld().getWorldGeometry().getAnimation(AnimationId::AH_LEFT).frames;
+      break;
+    case core::Axis::NegZ:
+      frame = getWorld().getWorldGeometry().getAnimation(AnimationId::AH_BACKWARD).frames;
+      break;
+    case core::Axis::NegX:
+      frame = getWorld().getWorldGeometry().getAnimation(AnimationId::AH_RIGHT).frames;
+      break;
+    default:
+      frame = getWorld().getWorldGeometry().getAnimation(AnimationId::AH_FORWARD).frames;
+      break;
+    }
+    frame = frame->next(hit_frame.get());
+    nextFrame = frame->next(std::min(hit_frame + 1_frame, core::HitAnimationLastFrame).get());
+  }
+  else if(interpolationInfo.firstFrame != interpolationInfo.secondFrame
+          || nextInterpolationInfo.firstFrame != nextInterpolationInfo.secondFrame)
+  {
+    updateLogicPoseInterpolated(interpolationInfo, nextInterpolationInfo);
+    return;
+  }
+  else
+  {
+    frame = interpolationInfo.firstFrame;
+    nextFrame = nextInterpolationInfo.firstFrame;
+  }
+
+  const auto matrices = calcPoseMatrices(objInfo, *frame);
+  const auto nextMatrices = calcPoseMatrices(objInfo, *nextFrame);
+  gsl_Assert(matrices.size() == nextMatrices.size());
+
+  for(size_t i = 0; i < matrices.size(); ++i)
+  {
+    getSkeleton()->setPoseMatrix(i, matrices[i], nextMatrices[i]);
+  }
+
+  updateMuzzleFlashLightPosStrength();
+}
+
+void LaraObject::updateLogicPoseInterpolated(const AnimSegmentInterpolationInfo& interpolationInfo,
+                                             const AnimSegmentInterpolationInfo& nextInterpolationInfo)
+{
+  const auto& objInfo = *getWorld().getWorldGeometry().findAnimatedModelForType(m_state.type);
+
+  const auto matrices = calcPoseMatricesInterpolated(objInfo, interpolationInfo);
+  const auto nextMatrices = calcPoseMatricesInterpolated(objInfo, nextInterpolationInfo);
+  gsl_Assert(matrices.size() == nextMatrices.size());
+
+  for(size_t i = 0; i < matrices.size(); ++i)
+  {
+    getSkeleton()->setPoseMatrix(i, matrices[i], nextMatrices[i]);
+  }
+
   updateMuzzleFlashLightPosStrength();
 }
 
@@ -1833,7 +1710,7 @@ void LaraObject::renderMuzzleFlash(const WeaponType weaponType,
   }
 
   core::Shade shade{core::Shade::type{0}};
-  core::Length dy = 0_len;
+  auto dy = 0_len;
   switch(weaponType)
   {
   case WeaponType::None:
@@ -1865,7 +1742,8 @@ void LaraObject::renderMuzzleFlash(const WeaponType weaponType,
   muzzleFlashNode->setLocalMatrix(getNode()->getLocalMatrix() * m);
 
   muzzleFlashNode->bind("u_lightAmbient",
-                        [brightness = toBrightness(shade)](const render::scene::Node* /*node*/,
+                        [brightness = toBrightness(shade)](const render::scene::Node* /*node*/
+                                                           ,
                                                            const render::scene::Mesh& /*mesh*/,
                                                            gl::Uniform& uniform)
                         {
@@ -1885,8 +1763,8 @@ void LaraObject::burnIfAlive()
   if(isDead())
     return;
 
-  const auto sector = m_state.location.moved({}).updateRoom();
-  if(HeightInfo::fromFloor(sector,
+  if(const auto sector = m_state.location.moved({}).updateRoom();
+     HeightInfo::fromFloor(sector,
                            {m_state.location.position.X, 32000_len, m_state.location.position.Z},
                            getWorld().getObjectManager().getObjects())
        .y
@@ -1898,7 +1776,7 @@ void LaraObject::burnIfAlive()
 
   for(size_t i = 0; i < 10; ++i)
   {
-    auto particle = gsl::make_shared<FlameParticle>(m_state.location, getWorld(), true);
+    const auto particle = gsl_lite::make_shared<FlameParticle>(m_state.location, getWorld(), true);
     setParent(particle, m_state.location.room->node);
     getWorld().getObjectManager().registerParticle(particle);
   }
@@ -1963,10 +1841,10 @@ void LaraObject::deserialize(const serialization::Deserializer<world::World>& se
 }
 
 LaraObject::LaraObject(const std::string& name,
-                       const gsl::not_null<world::World*>& world,
-                       const gsl::not_null<const world::Room*>& room,
+                       const gsl_lite::not_null<world::World*>& world,
+                       const gsl_lite::not_null<const world::Room*>& room,
                        const loader::file::Item& item,
-                       const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                       const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject(name, world, room, item, false, animatedModel, true)
     , flashLightsBuffer{
         std::make_shared<gl::ShaderStorageBuffer<ShaderLight>>("dynamic-lights", gl::api::BufferUsage::DynamicDraw, 2)}
@@ -2020,15 +1898,15 @@ void LaraObject::initMuzzleFlashes()
 
   world::RenderMeshDataCompositor compositor;
   compositor.append(*muzzleFlashModel->bones[0].mesh, gl::SRGBA8{0, 0, 0, 0});
-  auto mesh = compositor.toMesh(
-    *getWorld().getPresenter().getMaterialManager(),
+  const auto mesh = compositor.toMesh(
+    getWorld().getEngine().getPresenter().getRenderSystem().getMaterialManager(),
     false,
     false,
-    [&engine = getWorld().getEngine()]()
+    [&engine = getWorld().getEngine()]
     {
       return engine.getEngineConfig()->animSmoothing;
     },
-    [&engine = getWorld().getEngine()]()
+    [&engine = getWorld().getEngine()]
     {
       const auto& settings = engine.getEngineConfig()->renderSettings;
       return !settings.lightingModeActive ? 0 : settings.lightingMode;
@@ -2054,18 +1932,14 @@ void LaraObject::updateExplosionStumbling()
     playSoundEffect(TR1SoundEffect::LaraOof);
   }
 
-  hit_frame += 1_frame;
-  if(hit_frame > 34_frame)
-  {
-    hit_frame = 34_frame;
-  }
+  hit_frame = std::min(hit_frame + 1_frame, core::HitAnimationLastFrame);
   explosionStumblingDuration -= 1_frame;
 }
 
 ghosting::GhostFrame LaraObject::getGhostFrame() const
 {
   ghosting::GhostFrame frame;
-  frame.roomId = gsl::narrow<uint16_t>(m_state.location.room->physicalId);
+  frame.roomId = gsl_lite::narrow<uint16_t>(m_state.location.room->physicalId);
   frame.modelMatrix = getSkeleton()->getLocalMatrix();
   for(size_t i = 0; i < getSkeleton()->getBoneCount(); ++i)
   {
@@ -2081,7 +1955,7 @@ ghosting::GhostFrame LaraObject::getGhostFrame() const
     }
 
     frame.bones.emplace_back(ghosting::GhostFrame::BoneData{
-      getSkeleton()->getPoseMatrix(i), gsl::narrow<uint16_t>(idx), getSkeleton()->isVisible(i)});
+      getSkeleton()->getPoseMatrix(i), gsl_lite::narrow<uint16_t>(idx), getSkeleton()->isVisible(i)});
   }
 
   return frame;
@@ -2128,7 +2002,7 @@ void LaraObject::updateCheats()
   case WaitTurn:
     if(getCurrentAnimState() != LaraStateId::Stop)
     {
-      m_cheatTotalRotation = 0;
+      m_cheatTotalRotation = 0_deg;
       m_cheatLastRotation = m_state.rotation.Y;
       switch(getCurrentAnimState())
       {
@@ -2147,23 +2021,23 @@ void LaraObject::updateCheats()
   case WaitTurnL:
     if(getCurrentAnimState() == LaraStateId::TurnLeftSlow || getCurrentAnimState() == LaraStateId::TurnFast)
     {
-      m_cheatTotalRotation += toDegrees(m_state.rotation.Y - m_cheatLastRotation);
+      m_cheatTotalRotation += m_state.rotation.Y - m_cheatLastRotation;
       m_cheatLastRotation = m_state.rotation.Y;
     }
     else
     {
-      m_cheatIdx = m_cheatTotalRotation < -517.5f ? WaitJump : WaitWalkFwd;
+      m_cheatIdx = m_cheatTotalRotation < -517.5_deg ? WaitJump : WaitWalkFwd;
     }
     break;
   case WaitTurnR:
     if(getCurrentAnimState() == LaraStateId::TurnRightSlow || getCurrentAnimState() == LaraStateId::TurnFast)
     {
-      m_cheatTotalRotation += toDegrees(m_state.rotation.Y - m_cheatLastRotation);
+      m_cheatTotalRotation += m_state.rotation.Y - m_cheatLastRotation;
       m_cheatLastRotation = m_state.rotation.Y;
     }
     else
     {
-      m_cheatIdx = m_cheatTotalRotation > 517.5f ? WaitJump : WaitWalkFwd;
+      m_cheatIdx = m_cheatTotalRotation > 517.5_deg ? WaitJump : WaitWalkFwd;
     }
     break;
   case WaitJump:
@@ -2212,9 +2086,9 @@ void LaraObject::updateCheats()
         return;
       }
 
-      for(const auto& [objectId, object] : getWorld().getObjectManager().getObjects())
+      for(const auto& object : getWorld().getObjectManager().getObjects() | std::views::values)
       {
-        if(auto ai = gslu::dynamic_pointer_cast<objects::AIAgent>(object); ai != nullptr && ai->m_state.health > 0_hp)
+        if(auto ai = gslu::dynamic_pointer_cast<AIAgent>(object); ai != nullptr && ai->m_state.health > 0_hp)
         {
           ai->m_state.health = std::max(1_hp, ai->m_state.health / 2);
         }
@@ -2259,7 +2133,7 @@ void LaraObject::updateCheats()
 
 void LaraObject::updateMuzzleFlashLightPosStrength()
 {
-  static constexpr const auto Strength = 2.0f * glm::vec4{1.0f, 0.94f, 0.58f, 0.0f};
+  static const auto Strength = 2.0f * glm::vec4{1.0f, 0.94f, 0.58f, 0.0f};
 
   flashLightsBufferData.clear();
 
@@ -2280,4 +2154,4 @@ void LaraObject::updateMuzzleFlashLightPosStrength()
   }
   flashLightsBuffer->setSubData(flashLightsBufferData, 0);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/laraobject.h b/src/engine/objects/laraobject.h
index 6ced3375f..81b4dda71 100644
--- a/src/engine/objects/laraobject.h
+++ b/src/engine/objects/laraobject.h
@@ -26,7 +26,7 @@
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -43,7 +43,7 @@ struct SkeletalModelType;
 
 namespace engine
 {
-struct InterpolationInfo;
+struct AnimSegmentInterpolationInfo;
 }
 
 namespace loader::file
@@ -81,7 +81,6 @@ class LaraObject final : public ModelObject
   using LaraStateId = loader::file::LaraStateId;
   using AnimationId = loader::file::AnimationId;
 
-private:
   //! @brief Additional rotation per TR Engine Frame
   core::RotationSpeed m_yRotationSpeed{0_deg / 1_frame};
   core::Speed m_fallSpeedOverride = 0_spd;
@@ -100,19 +99,19 @@ class LaraObject final : public ModelObject
 #endif
 
 public:
-  LaraObject(const gsl::not_null<world::World*>& world, const Location& location)
+  LaraObject(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
-      , flashLightsBuffer{std::make_shared<gl::ShaderStorageBuffer<engine::ShaderLight>>(
+      , flashLightsBuffer{std::make_shared<gl::ShaderStorageBuffer<ShaderLight>>(
           "dynamic-lights", gl::api::BufferUsage::DynamicDraw, 2)}
   {
     initMuzzleFlashes();
   }
 
   LaraObject(const std::string& name,
-             const gsl::not_null<world::World*>& world,
-             const gsl::not_null<const world::Room*>& room,
+             const gsl_lite::not_null<world::World*>& world,
+             const gsl_lite::not_null<const world::Room*>& room,
              const loader::file::Item& item,
-             const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
   LaraObject(const LaraObject&) = delete;
   LaraObject(LaraObject&&) = delete;
@@ -141,9 +140,11 @@ class LaraObject final : public ModelObject
     return m_air;
   }
 
-  void advanceFrame();
+  void advanceLaraFrame();
+
+  void updateLogic() override;
 
-  void update() override;
+  void updatePrediction() override;
 
   void applyShift(const CollisionInfo& collisionInfo) noexcept
   {
@@ -152,9 +153,9 @@ class LaraObject final : public ModelObject
   }
 
 private:
-  void handleLaraStateOnLand();
-  void handleLaraStateDiving();
-  void handleLaraStateSwimming();
+  void handleLaraStateOnLand(const hid::InputHandler& inputHandler);
+  void handleLaraStateDiving(const hid::InputHandler& inputHandler);
+  void handleLaraStateSwimming(const hid::InputHandler& inputHandler);
   void testInteractions(CollisionInfo& collisionInfo);
 
   core::Frame m_swimToDiveKeypressDuration = 0_frame;
@@ -328,11 +329,11 @@ class LaraObject final : public ModelObject
   gslu::nn_shared<render::scene::Node> m_muzzleFlashLeft{std::make_shared<render::scene::Node>("muzzle flash left")};
   gslu::nn_shared<render::scene::Node> m_muzzleFlashRight{std::make_shared<render::scene::Node>("muzzle flash right")};
 
-  void updateLarasWeaponsStatus();
+  void updateLaraWeaponsStatus(const hid::InputHandler& inputHandler);
 
-  void updateShotgun();
+  void updateShotgun(const hid::InputHandler& inputHandler);
 
-  void updateTwoWeapons(WeaponType weaponType);
+  void updateTwoWeapons(WeaponType weaponType, const hid::InputHandler& inputHandler);
 
   void updateAimingState(const Weapon& weapon);
 
@@ -351,7 +352,7 @@ class LaraObject final : public ModelObject
 
   void drawShotgun();
 
-  void updateAnimShotgun();
+  void updateAnimShotgun(const hid::InputHandler& inputHandler);
 
   bool tryShootShot(WeaponType weaponType,
                     const std::shared_ptr<ModelObject>& targetObject,
@@ -364,7 +365,7 @@ class LaraObject final : public ModelObject
 
   void holsterTwoWeapons(WeaponType weaponType);
 
-  void updateAnimTwoWeapons(WeaponType weaponType);
+  void updateAnimTwoWeapons(WeaponType weaponType, const hid::InputHandler& inputHandler);
 
   void hitTarget(ModelObject& object, const core::TRVec& hitPos, const core::Health& damage);
 
@@ -373,9 +374,10 @@ class LaraObject final : public ModelObject
                          const gslu::nn_shared<render::scene::Node>& muzzleFlashNode,
                          bool visible) const;
 
-  void drawRoutine();
+  void updateLogicPose();
 
-  void drawRoutineInterpolated(const InterpolationInfo& interpolationInfo);
+  void updateLogicPoseInterpolated(const AnimSegmentInterpolationInfo& interpolationInfo,
+                                   const AnimSegmentInterpolationInfo& nextInterpolationInfo);
 
   void alignForInteraction(const core::TRVec& offset, const ObjectState& objectState)
   {
@@ -405,7 +407,7 @@ class LaraObject final : public ModelObject
 private:
   uint8_t m_cheatIdx = 0;
   core::Angle m_cheatLastRotation = 0_deg;
-  float m_cheatTotalRotation = 0;
+  core::Angle m_cheatTotalRotation = 0_deg;
 
   void initMuzzleFlashes();
   void updateCheats();
@@ -414,5 +416,10 @@ class LaraObject final : public ModelObject
                           const std::shared_ptr<ModelObject>& targetObject,
                           const ModelObject& weaponHolder,
                           const core::TRRotationXY& aimAngle);
+
+  std::vector<glm::mat4> calcPoseMatrices(const world::SkeletalModelType& objInfo,
+                                          const loader::file::AnimFrame& frame) const;
+  std::vector<glm::mat4> calcPoseMatricesInterpolated(const world::SkeletalModelType& objInfo,
+                                                      const AnimSegmentInterpolationInfo& interpolationInfo) const;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/larson.cpp b/src/engine/objects/larson.cpp
index f6fba3571..2ce086451 100644
--- a/src/engine/objects/larson.cpp
+++ b/src/engine/objects/larson.cpp
@@ -14,18 +14,18 @@
 #include "qs/qs.h"
 #include "util/helpers.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::objects
 {
-void Larson::update()
+void Larson::updateLogic()
 {
   activateAi();
 
-  core::Angle tiltRot = 0_deg;
-  core::Angle turn = 0_deg;
-  core::Angle headRot = 0_deg;
+  auto tiltRot = 0_deg;
+  auto turn = 0_deg;
+  auto headRot = 0_deg;
   if(alive())
   {
     const ai::EnemyLocation enemyLocation{*this};
@@ -112,7 +112,7 @@ void Larson::update()
   else if(m_state.current_anim_state != 5_as) // injured/dying
   {
     getSkeleton()->setAnim(
-      gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Larson)->animations[15]});
+      gsl_lite::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Larson)->animations[15]});
     m_state.current_anim_state = 5_as;
   }
   rotateCreatureTilt(tiltRot);
@@ -120,4 +120,4 @@ void Larson::update()
   getSkeleton()->patchBone(7, core::TRRotation{0_deg, getCreatureInfo()->headRotation, 0_deg}.toMatrix());
   animateCreature(turn, 0_deg);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/larson.h b/src/engine/objects/larson.h
index 0e1564be7..fa7920df3 100644
--- a/src/engine/objects/larson.h
+++ b/src/engine/objects/larson.h
@@ -21,6 +21,6 @@ class Larson final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Larson)
 
-  void update() override;
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/lavaparticleemitter.cpp b/src/engine/objects/lavaparticleemitter.cpp
index 2be2964f2..a4811ead6 100644
--- a/src/engine/objects/lavaparticleemitter.cpp
+++ b/src/engine/objects/lavaparticleemitter.cpp
@@ -9,16 +9,16 @@
 #include "objectstate.h"
 #include "render/scene/node.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::objects
 {
-void LavaParticleEmitter::update()
+void LavaParticleEmitter::updateLogic()
 {
-  auto particle = gsl::make_shared<LavaParticle>(m_state.location, getWorld());
+  const auto particle = gsl_lite::make_shared<LavaParticle>(m_state.location, getWorld());
   setParent(particle, m_state.location.room->node);
   getWorld().getObjectManager().registerParticle(particle);
 
   playSoundEffect(TR1SoundEffect::ChoppyWater);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/lavaparticleemitter.h b/src/engine/objects/lavaparticleemitter.h
index d3da30cf1..89f266f9e 100644
--- a/src/engine/objects/lavaparticleemitter.h
+++ b/src/engine/objects/lavaparticleemitter.h
@@ -2,7 +2,7 @@
 
 #include "modelobject.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -27,20 +27,20 @@ namespace engine::objects
 class LavaParticleEmitter final : public NullRenderModelObject
 {
 public:
-  LavaParticleEmitter(const gsl::not_null<world::World*>& world, const Location& location)
+  LavaParticleEmitter(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : NullRenderModelObject{world, location}
   {
   }
 
   LavaParticleEmitter(const std::string& name,
-                      const gsl::not_null<world::World*>& world,
-                      const gsl::not_null<const world::Room*>& room,
+                      const gsl_lite::not_null<world::World*>& world,
+                      const gsl_lite::not_null<const world::Room*>& room,
                       const loader::file::Item& item,
-                      const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                      const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : NullRenderModelObject{name, world, room, item, true, animatedModel}
   {
   }
 
-  void update() override;
+  void updateLogic() override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/lightningemitter.cpp b/src/engine/objects/lightningemitter.cpp
index d98947aeb..4f147c30e 100644
--- a/src/engine/objects/lightningemitter.cpp
+++ b/src/engine/objects/lightningemitter.cpp
@@ -4,6 +4,7 @@
 #include "core/genericvec.h"
 #include "core/magic.h"
 #include "core/units.h"
+#include "engine/engine.h"
 #include "engine/heightinfo.h"
 #include "engine/location.h"
 #include "engine/objectmanager.h"
@@ -42,7 +43,7 @@
 #include <glm/geometric.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -56,7 +57,7 @@ namespace engine::objects
 namespace
 {
 std::tuple<gslu::nn_shared<render::scene::Mesh>, gslu::nn_shared<gl::VertexBuffer<glm::vec3>>>
-  createBolt(const gslu::nn_shared<render::material::Material>& material, float lineWidth)
+  createBolt(const gslu::nn_shared<render::material::Material>& material, const float lineWidth)
 {
   std::array<glm::vec3, LightningEmitter::ControlPoints> vertices{};
 
@@ -67,15 +68,15 @@ std::tuple<gslu::nn_shared<render::scene::Mesh>, gslu::nn_shared<gl::VertexBuffe
   for(uint16_t i = 0; i < LightningEmitter::ControlPoints; ++i)
     indices.emplace_back(i);
 
-  auto indexBuffer = gsl::make_shared<gl::ElementArrayBuffer<uint16_t>>(
+  auto indexBuffer = gsl_lite::make_shared<gl::ElementArrayBuffer<uint16_t>>(
     "bolt" + gl::IndexBufferSuffix, gl::api::BufferUsage::StreamDraw, indices);
 
-  auto vb = gsl::make_shared<gl::VertexBuffer<glm::vec3>>(
+  auto vb = gsl_lite::make_shared<gl::VertexBuffer<glm::vec3>>(
     layout, "bolt" + gl::VboSuffix, gl::api::BufferUsage::StreamDraw, vertices);
 
-  auto opaqueVao = gsl::make_shared<gl::VertexArray<uint16_t, glm::vec3>>(
+  auto opaqueVao = gsl_lite::make_shared<gl::VertexArray<uint16_t, glm::vec3>>(
     indexBuffer, vb, std::vector{&material->getShaderProgram()->getHandle()}, "bolt" + gl::VaoSuffix);
-  auto mesh = gsl::make_shared<render::scene::MeshImpl<uint16_t, glm::vec3>>(
+  auto mesh = gsl_lite::make_shared<render::scene::MeshImpl<uint16_t, glm::vec3>>(
     opaqueVao, nullptr, gl::api::PrimitiveType::LineStrip);
 
   mesh->getRenderState().setLineSmooth(true);
@@ -91,7 +92,7 @@ using Bolt = std::array<glm::vec3, LightningEmitter::ControlPoints>;
 
 Bolt updateBolt(const glm::vec3& start, const glm::vec3& end, const std::shared_ptr<gl::VertexBuffer<glm::vec3>>& vb)
 {
-  std::vector<glm::vec3> data{start, end};
+  std::vector data{start, end};
   static constexpr float RadiusRatio = 0.3f;
   auto radius = static_cast<float>(glm::distance(start, end) * RadiusRatio);
   for(size_t i = 0; i < LightningEmitter::SegmentSplits; ++i)
@@ -124,15 +125,15 @@ Bolt updateBolt(const glm::vec3& start, const glm::vec3& end, const std::shared_
     radius /= 2;
   }
 
-  gsl_Assert(gsl::narrow<size_t>(vb->size()) == data.size());
+  gsl_Assert(gsl_lite::narrow<size_t>(vb->size()) == data.size());
 
   Bolt bolt;
   auto boltData
     = vb->map(gl::api::MapBufferAccessMask::MapWriteBit | gl::api::MapBufferAccessMask::MapFlushExplicitBit);
   gsl_Assert(boltData.size() == data.size());
   gsl_Assert(boltData.size() == bolt.size());
-  std::copy(data.begin(), data.end(), boltData.begin());
-  std::copy(data.begin(), data.end(), bolt.begin());
+  std::ranges::copy(data, boltData.begin());
+  std::ranges::copy(data, bolt.begin());
   boltData.flush();
 
   return bolt;
@@ -140,23 +141,24 @@ Bolt updateBolt(const glm::vec3& start, const glm::vec3& end, const std::shared_
 } // namespace
 
 LightningEmitter::LightningEmitter(const std::string& name,
-                                   const gsl::not_null<world::World*>& world,
-                                   const gsl::not_null<const world::Room*>& room,
+                                   const gsl_lite::not_null<world::World*>& world,
+                                   const gsl_lite::not_null<const world::Room*>& room,
                                    const loader::file::Item& item,
-                                   const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                                   const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
   if(!animatedModel->bones.empty())
   {
-    m_poles = gsl::narrow_cast<size_t>(animatedModel->bones.size() - 1u);
+    m_poles = gsl_lite::narrow_cast<size_t>(animatedModel->bones.size() - 1u);
   }
 
   init(*world);
+  advanceFrame();
   prepareRender();
   getSkeleton()->getRenderState().setScissorTest(false);
 }
 
-void LightningEmitter::update()
+void LightningEmitter::updateLogic()
 {
   if(!m_state.updateActivationTimeout())
   {
@@ -168,10 +170,12 @@ void LightningEmitter::update()
 
     deactivate();
     m_state.triggerState = TriggerState::Inactive;
+    advanceFrame();
     prepareRender();
     return;
   }
 
+  advanceFrame();
   prepareRender();
 
   if(--m_chargeTimeout > 0)
@@ -192,8 +196,8 @@ void LightningEmitter::update()
   m_chargeTimeout = 20;
   m_laraHit = false;
 
-  const auto radius = m_poles == 0 ? 1_sectors : 5_sectors / 2;
-  if(getWorld().getObjectManager().getLara().isNearInexact(m_state.location.position, radius))
+  if(const auto radius = m_poles == 0 ? 1_sectors : 5_sectors / 2;
+     getWorld().getObjectManager().getLara().isNearInexact(m_state.location.position, radius))
   {
     // target at lara
     m_mainBoltEnd = getWorld().getObjectManager().getLara().m_state.location.position - m_state.location.position;
@@ -236,14 +240,11 @@ void LightningEmitter::collide(CollisionInfo& /*info*/)
 
   auto& lara = getWorld().getObjectManager().getLara();
   lara.hit_direction = static_cast<core::Axis>(util::rand15(4));
-  lara.hit_frame += 1_frame;
-  if(lara.hit_frame > 34_frame)
-    lara.hit_frame = 34_frame;
+  lara.hit_frame = std::min(lara.hit_frame + 1_frame, core::HitAnimationLastFrame);
 }
 
 void LightningEmitter::prepareRender()
 {
-  ModelObject::update();
   for(size_t i = 1; i < getSkeleton()->getBoneCount(); ++i)
     getSkeleton()->setVisible(i, false);
   getSkeleton()->rebuildMesh();
@@ -271,20 +272,22 @@ void LightningEmitter::prepareRender()
 
 void LightningEmitter::init(world::World& world)
 {
-  std::tie(m_mainBoltMesh, m_mainVb) = createBolt(world.getPresenter().getMaterialManager()->getLightning(), 10);
+  std::tie(m_mainBoltMesh, m_mainVb)
+    = createBolt(world.getEngine().getPresenter().getRenderSystem().getMaterialManager().getLightning(), 10);
   m_mainBoltNode = std::make_shared<render::scene::Node>("lightning-bolt-main");
   m_mainBoltNode->setRenderable(m_mainBoltMesh);
   m_mainBoltNode->setVisible(false);
-  addChild(gsl::not_null{getSkeleton()}, gsl::not_null{m_mainBoltNode});
+  addChild(gsl_lite::not_null{getSkeleton()}, gsl_lite::not_null{m_mainBoltNode});
 
   for(auto& childBolt : m_childBolts)
   {
-    std::tie(childBolt.mesh, childBolt.vb) = createBolt(world.getPresenter().getMaterialManager()->getLightning(), 3);
+    std::tie(childBolt.mesh, childBolt.vb)
+      = createBolt(world.getEngine().getPresenter().getRenderSystem().getMaterialManager().getLightning(), 3);
 
     childBolt.node = std::make_shared<render::scene::Node>("lightning-bolt-child");
     childBolt.node->setRenderable(childBolt.mesh);
     childBolt.node->setVisible(false);
-    addChild(gsl::not_null{getSkeleton()}, gsl::not_null{childBolt.node});
+    addChild(gsl_lite::not_null{getSkeleton()}, gsl_lite::not_null{childBolt.node});
   }
 }
 
@@ -311,8 +314,9 @@ void LightningEmitter::deserialize(const serialization::Deserializer<world::Worl
   ser << [this](const serialization::Deserializer<world::World>& /*ser*/)
   {
     prepareRender();
+    advanceFrame();
   };
 
   getSkeleton()->getRenderState().setScissorTest(false);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/lightningemitter.h b/src/engine/objects/lightningemitter.h
index ad09afa22..7fe78720e 100644
--- a/src/engine/objects/lightningemitter.h
+++ b/src/engine/objects/lightningemitter.h
@@ -8,7 +8,7 @@
 #include <cstddef>
 #include <gl/soglb_fwd.h>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -41,18 +41,18 @@ namespace engine::objects
 class LightningEmitter final : public ModelObject
 {
 public:
-  LightningEmitter(const gsl::not_null<world::World*>& world, const Location& location)
+  LightningEmitter(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   LightningEmitter(const std::string& name,
-                   const gsl::not_null<world::World*>& world,
-                   const gsl::not_null<const world::Room*>& room,
+                   const gsl_lite::not_null<world::World*>& world,
+                   const gsl_lite::not_null<const world::Room*>& room,
                    const loader::file::Item& item,
-                   const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                   const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& info) override;
 
@@ -89,4 +89,4 @@ class LightningEmitter final : public ModelObject
 
   void init(world::World& world);
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/lion.cpp b/src/engine/objects/lion.cpp
index 4c55e3e92..4b90e21f6 100644
--- a/src/engine/objects/lion.cpp
+++ b/src/engine/objects/lion.cpp
@@ -14,18 +14,18 @@
 #include "qs/qs.h"
 #include "util/helpers.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::objects
 {
-void Lion::update()
+void Lion::updateLogic()
 {
   activateAi();
 
-  core::Angle roll = 0_deg;
-  core::Angle turn = 0_deg;
-  core::Angle headRot = 0_deg;
+  auto roll = 0_deg;
+  auto turn = 0_deg;
+  auto headRot = 0_deg;
 
   if(alive())
   {
@@ -102,24 +102,24 @@ void Lion::update()
     {
       if(m_state.type == TR1ItemId::Panther)
       {
-        getSkeleton()->setAnim(gsl::not_null{&getWorld()
-                                                .getWorldGeometry()
-                                                .findAnimatedModelForType(TR1ItemId::Panther)
-                                                ->animations[4 + util::rand15(2)]});
+        getSkeleton()->setAnim(gsl_lite::not_null{&getWorld()
+                                                     .getWorldGeometry()
+                                                     .findAnimatedModelForType(TR1ItemId::Panther)
+                                                     ->animations[4 + util::rand15(2)]});
       }
       else if(m_state.type == TR1ItemId::LionMale)
       {
-        getSkeleton()->setAnim(gsl::not_null{&getWorld()
-                                                .getWorldGeometry()
-                                                .findAnimatedModelForType(TR1ItemId::LionMale)
-                                                ->animations[7 + util::rand15(2)]});
+        getSkeleton()->setAnim(gsl_lite::not_null{&getWorld()
+                                                     .getWorldGeometry()
+                                                     .findAnimatedModelForType(TR1ItemId::LionMale)
+                                                     ->animations[7 + util::rand15(2)]});
       }
       else
       {
-        getSkeleton()->setAnim(gsl::not_null{&getWorld()
-                                                .getWorldGeometry()
-                                                .findAnimatedModelForType(TR1ItemId::LionFemale)
-                                                ->animations[7 + util::rand15(2)]});
+        getSkeleton()->setAnim(gsl_lite::not_null{&getWorld()
+                                                     .getWorldGeometry()
+                                                     .findAnimatedModelForType(TR1ItemId::LionFemale)
+                                                     ->animations[7 + util::rand15(2)]});
       }
       m_state.current_anim_state = 5_as;
     }
@@ -130,4 +130,4 @@ void Lion::update()
   getSkeleton()->patchBone(20, core::TRRotation{0_deg, getCreatureInfo()->headRotation, 0_deg}.toMatrix());
   animateCreature(turn, roll);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/lion.h b/src/engine/objects/lion.h
index cfdc1f5a1..8f424bf03 100644
--- a/src/engine/objects/lion.h
+++ b/src/engine/objects/lion.h
@@ -21,6 +21,6 @@ class Lion final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Lion)
 
-  void update() override;
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/matrixstack.cpp b/src/engine/objects/matrixstack.cpp
new file mode 100644
index 000000000..ebd5d5679
--- /dev/null
+++ b/src/engine/objects/matrixstack.cpp
@@ -0,0 +1,94 @@
+#include "matrixstack.h"
+
+#include <glm/ext/matrix_transform.hpp>
+
+namespace engine::objects
+{
+MatrixStack::MatrixStack()
+{
+  m_stack.emplace(1.0f);
+}
+
+void MatrixStack::push()
+{
+  const auto top = m_stack.top();
+  m_stack.emplace(top);
+}
+
+void MatrixStack::pop() noexcept
+{
+  m_stack.pop();
+}
+
+void MatrixStack::multiply(const glm::mat4& m)
+{
+  m_stack.top() *= m;
+}
+
+void MatrixStack::rotate(const core::TRRotation& r)
+{
+  multiply(r.toMatrix());
+}
+
+void MatrixStack::rotate(const core::TRRotationXY& r)
+{
+  multiply(r.toMatrix());
+}
+
+void MatrixStack::resetRotation()
+{
+  m_stack.top()[0] = glm::vec4{1, 0, 0, 0};
+  m_stack.top()[1] = glm::vec4{0, 1, 0, 0};
+  m_stack.top()[2] = glm::vec4{0, 0, 1, 0};
+}
+
+void MatrixStack::rotate(const uint8_t* packed)
+{
+  m_stack.top() *= core::fromPackedAngles(packed);
+}
+
+void MatrixStack::translate(const glm::vec3& x)
+{
+  m_stack.top() = glm::translate(m_stack.top(), x);
+}
+
+void MatrixStack::transform(const std::initializer_list<size_t>& indices,
+                            const std::vector<world::SkeletalModelType::Bone>& bones,
+                            const gsl_lite::span<const uint8_t>& angleData)
+{
+  for(const auto idx : indices)
+    transform(idx, bones, angleData);
+}
+
+void MatrixStack::transform(const size_t idx,
+                            const std::vector<world::SkeletalModelType::Bone>& bones,
+                            const gsl_lite::span<const uint8_t>& angleData)
+{
+  BOOST_ASSERT(idx > 0);
+  translate(bones.at(idx).position);
+  rotate(&angleData[sizeof(uint32_t) * idx]);
+  apply(idx);
+}
+
+void MatrixStack::apply(const size_t idx)
+{
+  if(idx >= m_poseMatrices.size())
+    m_poseMatrices.resize(idx + 1);
+  m_poseMatrices[idx] = m_stack.top();
+}
+
+const std::vector<glm::mat4>& MatrixStack::getPoseMatrices() const noexcept
+{
+  return m_poseMatrices;
+}
+
+glm::mat4& MatrixStack::top() noexcept
+{
+  return m_stack.top();
+}
+
+const glm::mat4& MatrixStack::top() const noexcept
+{
+  return m_stack.top();
+}
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/matrixstack.h b/src/engine/objects/matrixstack.h
new file mode 100644
index 000000000..a2bda0972
--- /dev/null
+++ b/src/engine/objects/matrixstack.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "core/angle.h"
+#include "core/vec.h"
+#include "engine/world/skeletalmodeltype.h"
+
+#include <glm/mat4x4.hpp>
+#include <glm/vec3.hpp>
+#include <stack>
+#include <vector>
+
+namespace engine::objects
+{
+class MatrixStack
+{
+  std::stack<glm::mat4> m_stack;
+  std::vector<glm::mat4> m_poseMatrices;
+
+public:
+  explicit MatrixStack();
+
+  void push();
+
+  void pop() noexcept;
+
+  [[nodiscard]] const glm::mat4& top() const noexcept;
+
+  glm::mat4& top() noexcept;
+
+  void multiply(const glm::mat4& m);
+
+  void rotate(const core::TRRotation& r);
+
+  void rotate(const core::TRRotationXY& r);
+
+  void resetRotation();
+
+  void rotate(const uint8_t* packed);
+
+  void translate(const glm::vec3& x);
+
+  void transform(const std::initializer_list<size_t>& indices,
+                 const std::vector<world::SkeletalModelType::Bone>& bones,
+                 const gsl_lite::span<const uint8_t>& angleData);
+
+  void transform(const size_t idx,
+                 const std::vector<world::SkeletalModelType::Bone>& bones,
+                 const gsl_lite::span<const uint8_t>& angleData);
+
+  void apply(size_t idx);
+
+  [[nodiscard]] const std::vector<glm::mat4>& getPoseMatrices() const noexcept;
+};
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/midasgoldtouch.cpp b/src/engine/objects/midasgoldtouch.cpp
index 19fa18204..ab37f9b69 100644
--- a/src/engine/objects/midasgoldtouch.cpp
+++ b/src/engine/objects/midasgoldtouch.cpp
@@ -6,6 +6,7 @@
 #include "core/units.h"
 #include "core/vec.h"
 #include "engine/cameracontroller.h"
+#include "engine/engine.h"
 #include "engine/inventory.h"
 #include "engine/items_tr1.h"
 #include "engine/location.h"
@@ -24,7 +25,7 @@
 #include "objectstate.h"
 #include "qs/qs.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::objects
@@ -40,7 +41,7 @@ void MidasGoldTouch::collide(CollisionInfo& /*info*/)
      && m_state.location.position.Z + 1_sectors / 2
           > lara.m_state.location.position.Z) // cppcheck-suppress knownConditionTrueFalse
   {
-    lara.getSkeleton()->setAnim(gsl::not_null{
+    lara.getSkeleton()->setAnim(gsl_lite::not_null{
       &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::AlternativeLara)->animations[1]});
     lara.setCurrentAnimState(loader::file::LaraStateId::MidasDeath);
     lara.setGoalAnimState(loader::file::LaraStateId::MidasDeath);
@@ -48,11 +49,7 @@ void MidasGoldTouch::collide(CollisionInfo& /*info*/)
     getWorld().getPlayer().selectedWeaponType = WeaponType::None;
     lara.setAir(-1_frame);
     lara.m_state.falling = false;
-    auto& cameraController = getWorld().getCameraController();
-    cameraController.setMode(CameraMode::Cinematic);
-    cameraController.m_cinematicFrame = 0_frame;
-    cameraController.m_cinematicPos = lara.m_state.location.position;
-    cameraController.m_cinematicRot = lara.m_state.rotation;
+    getWorld().getCameraController().startCinematic(lara.m_state.location.position, lara.m_state.rotation);
     return;
   }
 
@@ -73,10 +70,15 @@ void MidasGoldTouch::collide(CollisionInfo& /*info*/)
 
   gsl_Expects(getWorld().getPlayer().getInventory().tryTake(TR1ItemId::LeadBar));
   getWorld().getPlayer().getInventory().put(TR1ItemId::Puzzle1Sprite, &getWorld());
-  lara.getSkeleton()->setAnim(
-    gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::AlternativeLara)->animations[0]});
+  lara.getSkeleton()->setAnim(gsl_lite::not_null{
+    &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::AlternativeLara)->animations[0]});
   lara.setCurrentAnimState(loader::file::LaraStateId::UseMidas);
   lara.setGoalAnimState(loader::file::LaraStateId::UseMidas);
   lara.setHandStatus(HandStatus::Grabbing);
 }
-} // namespace engine::objects
+
+void MidasGoldTouch::updateLogic()
+{
+  advanceFrame();
+}
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/midasgoldtouch.h b/src/engine/objects/midasgoldtouch.h
index bb8e54199..a5983c31f 100644
--- a/src/engine/objects/midasgoldtouch.h
+++ b/src/engine/objects/midasgoldtouch.h
@@ -2,7 +2,7 @@
 
 #include "modelobject.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -28,20 +28,22 @@ namespace engine::objects
 class MidasGoldTouch final : public NullRenderModelObject
 {
 public:
-  MidasGoldTouch(const gsl::not_null<world::World*>& world, const Location& location)
+  MidasGoldTouch(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : NullRenderModelObject{world, location}
   {
   }
 
   MidasGoldTouch(const std::string& name,
-                 const gsl::not_null<world::World*>& world,
-                 const gsl::not_null<const world::Room*>& room,
+                 const gsl_lite::not_null<world::World*>& world,
+                 const gsl_lite::not_null<const world::Room*>& room,
                  const loader::file::Item& item,
-                 const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                 const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : NullRenderModelObject{name, world, room, item, false, animatedModel}
   {
   }
 
   void collide(CollisionInfo& info) override;
+
+  void updateLogic() override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/modelobject.cpp b/src/engine/objects/modelobject.cpp
index 109d76f4d..618f4c6f0 100644
--- a/src/engine/objects/modelobject.cpp
+++ b/src/engine/objects/modelobject.cpp
@@ -30,7 +30,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <glm/geometric.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -40,11 +40,11 @@
 namespace engine::objects
 {
 ModelObject::ModelObject(const std::string& name,
-                         const gsl::not_null<world::World*>& world,
-                         const gsl::not_null<const world::Room*>& room,
+                         const gsl_lite::not_null<world::World*>& world,
+                         const gsl_lite::not_null<const world::Room*>& room,
                          const loader::file::Item& item,
                          const bool hasUpdateFunction,
-                         const gsl::not_null<const world::SkeletalModelType*>& model,
+                         const gsl_lite::not_null<const world::SkeletalModelType*>& model,
                          bool shadowCaster)
     : Object{world, room, item, hasUpdateFunction}
     , m_skeleton{std::make_shared<SkeletalModelNode>(name, world, model, shadowCaster)}
@@ -53,7 +53,7 @@ ModelObject::ModelObject(const std::string& name,
   m_lighting.bind(*m_skeleton, *world);
 }
 
-void ModelObject::update()
+void ModelObject::advanceFrame()
 {
   const auto endOfAnim = m_skeleton->advanceFrame(m_state);
 
@@ -83,7 +83,7 @@ void ModelObject::update()
         m_state.falling = true;
         cmd += 2;
         break;
-        // NOLINTNEXTLINE(bugprone-branch-clone)
+      // NOLINTNEXTLINE(bugprone-branch-clone)
       case AnimCommandOpcode::PlaySound:
         cmd += 2;
         break;
@@ -98,7 +98,7 @@ void ModelObject::update()
       }
     }
 
-    m_skeleton->setAnimation(m_state.current_anim_state, gsl::not_null{anim->nextAnimation}, anim->nextFrame);
+    m_skeleton->setAnimation(m_state.current_anim_state, gsl_lite::not_null{anim->nextAnimation}, anim->nextFrame);
     m_state.goal_anim_state = m_state.current_anim_state;
     if(m_state.current_anim_state == m_state.required_anim_state)
       m_state.required_anim_state = 0_as;
@@ -171,9 +171,8 @@ void ModelObject::applyMovement(const bool forLara)
     setCurrentRoom(m_state.location.room);
   }
 
-  applyTransform();
-
-  m_skeleton->updatePose();
+  m_skeleton->updateLogicPose(true);
+  applyLogicTransform();
 }
 
 core::BoundingBox ModelObject::getBoundingBox() const
@@ -186,8 +185,7 @@ bool ModelObject::isNear(const ModelObject& other, const core::Length& radius) c
   const auto bbox = getSkeleton()->getInterpolationInfo().getNearestFrame()->bbox.toBBox();
   const auto otherBBox = other.getSkeleton()->getInterpolationInfo().getNearestFrame()->bbox.toBBox();
   const auto selfY = m_state.location.position.Y + bbox.y;
-  const auto otherY = other.m_state.location.position.Y + otherBBox.y;
-  if(!selfY.intersectsExclusive(otherY))
+  if(const auto otherY = other.m_state.location.position.Y + otherBBox.y; !selfY.intersectsExclusive(otherY))
   {
     return false;
   }
@@ -200,8 +198,7 @@ bool ModelObject::isNear(const Particle& other, const core::Length& radius) cons
 {
   const auto frame = getSkeleton()->getInterpolationInfo().getNearestFrame();
   const auto bbox = frame->bbox.toBBox();
-  const auto selfY = m_state.location.position.Y + bbox.y;
-  if(!selfY.containsExclusive(other.location.position.Y))
+  if(const auto selfY = m_state.location.position.Y + bbox.y; !selfY.containsExclusive(other.location.position.Y))
   {
     return false;
   }
@@ -277,11 +274,7 @@ void ModelObject::enemyPush(CollisionInfo& collisionInfo, const bool enableSpaz,
     {
       lara.playSoundEffect(TR1SoundEffect::LaraOof);
     }
-    lara.hit_frame += 1_frame;
-    if(lara.hit_frame > 34_frame)
-    {
-      lara.hit_frame = 34_frame;
-    }
+    lara.hit_frame = std::min(lara.hit_frame + 1_frame, core::HitAnimationLastFrame);
   }
   collisionInfo.validFloorHeight = {-core::ClimbLimit2ClickMin, core::HeightLimit};
   collisionInfo.validCeilingHeightMin = 0_len;
@@ -319,8 +312,7 @@ bool ModelObject::testBoneCollision(const ModelObject& other)
         continue;
 
       const auto distance = glm::distance(otherSphere.getCollisionPosition(), boneSphere.getCollisionPosition());
-      const auto radii = (boneSphere.radius + otherSphere.radius).get<float>();
-      if(distance >= radii)
+      if(const auto radii = (boneSphere.radius + otherSphere.radius).get<float>(); distance >= radii)
         continue;
 
       m_state.touch_bits.set(boneSphereIdx);
@@ -369,14 +361,7 @@ void ModelObject::deserialize(const serialization::Deserializer<world::World>& s
   m_lighting.bind(*m_skeleton, *ser.context);
 }
 
-std::shared_ptr<ModelObject> ModelObject::create(serialization::Deserializer<world::World>& ser)
-{
-  auto result = std::make_shared<ModelObject>(ser.context, Location::create(ser["@location"]));
-  result->deserialize(ser);
-  return result;
-}
-
-void ModelObject::collideWithLara(CollisionInfo& collisionInfo, bool push)
+void ModelObject::collideWithLara(CollisionInfo& collisionInfo, const bool push)
 {
   const auto& lara = getWorld().getObjectManager().getLara();
 
@@ -408,7 +393,7 @@ ModelObject::~ModelObject()
 {
   if(m_skeleton != nullptr)
   {
-    setParent(gsl::not_null{m_skeleton}, nullptr);
+    setParent(gsl_lite::not_null{m_skeleton}, nullptr);
   }
 }
 
@@ -417,12 +402,6 @@ std::shared_ptr<render::scene::Node> ModelObject::getNode() const
   return m_skeleton;
 }
 
-std::shared_ptr<ModelObject> create(const serialization::TypeId<std::shared_ptr<ModelObject>>&,
-                                    serialization::Deserializer<world::World>& ser)
-{
-  return ModelObject::create(ser);
-}
-
 void NullRenderModelObject::serialize(const serialization::Serializer<world::World>& ser) const
 {
   ModelObject::serialize(ser);
@@ -437,15 +416,15 @@ void NullRenderModelObject::deserialize(const serialization::Deserializer<world:
 }
 
 NullRenderModelObject::NullRenderModelObject(const std::string& name,
-                                             const gsl::not_null<world::World*>& world,
-                                             const gsl::not_null<const world::Room*>& room,
+                                             const gsl_lite::not_null<world::World*>& world,
+                                             const gsl_lite::not_null<const world::Room*>& room,
                                              const loader::file::Item& item,
-                                             bool hasUpdateFunction,
-                                             const gsl::not_null<const world::SkeletalModelType*>& model)
+                                             const bool hasUpdateFunction,
+                                             const gsl_lite::not_null<const world::SkeletalModelType*>& model)
     : ModelObject{name, world, room, item, hasUpdateFunction, model, false}
 {
   getSkeleton()->setRenderable(nullptr);
   getSkeleton()->removeAllChildren();
   getSkeleton()->clearParts();
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/modelobject.h b/src/engine/objects/modelobject.h
index 3b904afde..2b9571f90 100644
--- a/src/engine/objects/modelobject.h
+++ b/src/engine/objects/modelobject.h
@@ -10,7 +10,7 @@
 #include "serialization/serialization_fwd.h"
 
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -45,17 +45,17 @@ namespace engine::objects
 class ModelObject : public Object
 {
 public:
-  ModelObject(const gsl::not_null<world::World*>& world, const Location& location)
+  ModelObject(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : Object{world, location}
   {
   }
 
   ModelObject(const std::string& name,
-              const gsl::not_null<world::World*>& world,
-              const gsl::not_null<const world::Room*>& room,
+              const gsl_lite::not_null<world::World*>& world,
+              const gsl_lite::not_null<const world::Room*>& room,
               const loader::file::Item& item,
               bool hasUpdateFunction,
-              const gsl::not_null<const world::SkeletalModelType*>& model,
+              const gsl_lite::not_null<const world::SkeletalModelType*>& model,
               bool shadowCaster);
 
   ModelObject(const ModelObject&) = delete;
@@ -93,8 +93,6 @@ class ModelObject : public Object
     return true;
   }
 
-  void update() override;
-
   void applyMovement(bool forLara);
 
   core::BoundingBox getBoundingBox() const override;
@@ -124,7 +122,7 @@ class ModelObject : public Object
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
 
-  static std::shared_ptr<ModelObject> create(serialization::Deserializer<world::World>& ser);
+  void advanceFrame();
 
 protected:
   std::shared_ptr<SkeletalModelNode> m_skeleton;
@@ -132,16 +130,16 @@ class ModelObject : public Object
 };
 
 #define MODELOBJECT_DEFAULT_CONSTRUCTORS(CLASS, HAS_UPDATE_FUNCTION, SHADOW_CASTER)             \
-  CLASS(const gsl::not_null<world::World*>& world, const Location& location)                    \
+  CLASS(const gsl_lite::not_null<world::World*>& world, const Location& location)               \
       : ModelObject{world, location}                                                            \
   {                                                                                             \
   }                                                                                             \
                                                                                                 \
   CLASS(const std::string& name,                                                                \
-        const gsl::not_null<world::World*>& world,                                              \
-        const gsl::not_null<const world::Room*>& room,                                          \
+        const gsl_lite::not_null<world::World*>& world,                                         \
+        const gsl_lite::not_null<const world::Room*>& room,                                     \
         const loader::file::Item& item,                                                         \
-        const gsl::not_null<const world::SkeletalModelType*>& animatedModel)                    \
+        const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)               \
       : ModelObject{name, world, room, item, HAS_UPDATE_FUNCTION, animatedModel, SHADOW_CASTER} \
   {                                                                                             \
   }
@@ -149,22 +147,19 @@ class ModelObject : public Object
 class NullRenderModelObject : public ModelObject
 {
 public:
-  NullRenderModelObject(const gsl::not_null<world::World*>& world, const Location& location)
+  NullRenderModelObject(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   NullRenderModelObject(const std::string& name,
-                        const gsl::not_null<world::World*>& world,
-                        const gsl::not_null<const world::Room*>& room,
+                        const gsl_lite::not_null<world::World*>& world,
+                        const gsl_lite::not_null<const world::Room*>& room,
                         const loader::file::Item& item,
                         bool hasUpdateFunction,
-                        const gsl::not_null<const world::SkeletalModelType*>& model);
+                        const gsl_lite::not_null<const world::SkeletalModelType*>& model);
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
 };
-
-std::shared_ptr<ModelObject> create(const serialization::TypeId<std::shared_ptr<ModelObject>>&,
-                                    serialization::Deserializer<world::World>& ser);
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/motorboat.cpp b/src/engine/objects/motorboat.cpp
index 60b071e03..7cb3eac16 100644
--- a/src/engine/objects/motorboat.cpp
+++ b/src/engine/objects/motorboat.cpp
@@ -6,7 +6,7 @@
 
 namespace engine::objects
 {
-void Motorboat::update()
+void Motorboat::updateLogic()
 {
   if(m_state.current_anim_state == 1_as)
   {
@@ -21,6 +21,6 @@ void Motorboat::update()
     kill();
   }
 
-  ModelObject::update();
+  advanceFrame();
 }
 } // namespace engine::objects
diff --git a/src/engine/objects/motorboat.h b/src/engine/objects/motorboat.h
index 1ffe4ab0f..8f088e42d 100644
--- a/src/engine/objects/motorboat.h
+++ b/src/engine/objects/motorboat.h
@@ -26,6 +26,6 @@ class Motorboat final : public ModelObject
 public:
   MODELOBJECT_DEFAULT_CONSTRUCTORS(Motorboat, true, false);
 
-  void update() override;
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/mummy.cpp b/src/engine/objects/mummy.cpp
index bcedff31f..30514784b 100644
--- a/src/engine/objects/mummy.cpp
+++ b/src/engine/objects/mummy.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <bitset>
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <initializer_list>
 #include <memory>
 #include <string>
@@ -25,10 +25,10 @@
 namespace engine::objects
 {
 Mummy::Mummy(const std::string& name,
-             const gsl::not_null<world::World*>& world,
-             const gsl::not_null<const world::Room*>& room,
+             const gsl_lite::not_null<world::World*>& world,
+             const gsl_lite::not_null<const world::Room*>& room,
              const loader::file::Item& item,
-             const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, true}
 {
   for(const size_t idx : {11, 12, 13, 14})
@@ -36,7 +36,7 @@ Mummy::Mummy(const std::string& name,
   getSkeleton()->rebuildMesh();
 }
 
-void Mummy::update()
+void Mummy::updateLogic()
 {
   if(m_state.current_anim_state == 1_as)
   {
@@ -53,7 +53,7 @@ void Mummy::update()
     }
   }
 
-  ModelObject::update();
+  advanceFrame();
 
   if(m_state.triggerState == TriggerState::Deactivated)
   {
@@ -66,4 +66,4 @@ void Mummy::collide(CollisionInfo& info)
 {
   collideWithLara(info);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/mummy.h b/src/engine/objects/mummy.h
index 1aacd7668..57842c184 100644
--- a/src/engine/objects/mummy.h
+++ b/src/engine/objects/mummy.h
@@ -3,7 +3,7 @@
 #include "core/units.h"
 #include "modelobject.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -29,22 +29,22 @@ namespace engine::objects
 class Mummy final : public ModelObject
 {
 public:
-  Mummy(const gsl::not_null<world::World*>& world, const Location& location)
+  Mummy(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   Mummy(const std::string& name,
-        const gsl::not_null<world::World*>& world,
-        const gsl::not_null<const world::Room*>& room,
+        const gsl_lite::not_null<world::World*>& world,
+        const gsl_lite::not_null<const world::Room*>& room,
         const loader::file::Item& item,
-        const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+        const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& info) override;
 
 private:
   core::Angle m_headRotation{0_deg};
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/mutant.cpp b/src/engine/objects/mutant.cpp
index cc0bf6e4f..429690fc5 100644
--- a/src/engine/objects/mutant.cpp
+++ b/src/engine/objects/mutant.cpp
@@ -33,14 +33,14 @@
 #include <algorithm>
 #include <bitset>
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 #include <utility>
 
 namespace engine::objects
 {
-void FlyingMutant::update()
+void FlyingMutant::updateLogic()
 {
   activateAi();
 
@@ -59,8 +59,8 @@ void FlyingMutant::update()
   static constexpr auto DoAttack = 11_as;
   static constexpr auto DoFly = 13_as;
 
-  core::Angle turn = 0_deg;
-  core::Angle headRot = 0_deg;
+  auto turn = 0_deg;
+  auto headRot = 0_deg;
   if(!alive())
   {
     if(shatterModel(*this, 0xffffffffu, 100_len))
@@ -311,12 +311,12 @@ void FlyingMutant::deserialize(const serialization::Deserializer<world::World>&
       S_NV("lookingAround", m_lookingAround));
 }
 
-void CentaurMutant::update()
+void CentaurMutant::updateLogic()
 {
   activateAi();
 
-  core::Angle turn = 0_deg;
-  core::Angle headRot = 0_deg;
+  auto turn = 0_deg;
+  auto headRot = 0_deg;
   if(getHealth() > 0_hp)
   {
     const ai::EnemyLocation enemyLocation{*this};
@@ -379,8 +379,8 @@ void CentaurMutant::update()
   else if(m_state.current_anim_state != 5_as)
   {
     m_state.current_anim_state = 5_as;
-    getSkeleton()->setAnim(
-      gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::CentaurMutant)->animations[8]});
+    getSkeleton()->setAnim(gsl_lite::not_null{
+      &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::CentaurMutant)->animations[8]});
   }
 
   rotateCreatureHead(headRot);
@@ -396,7 +396,7 @@ void CentaurMutant::update()
   }
 }
 
-void TorsoBoss::update()
+void TorsoBoss::updateLogic()
 {
   static constexpr auto Think = 1_as;
   static constexpr auto TurnLeft = 2_as;
@@ -412,7 +412,7 @@ void TorsoBoss::update()
 
   activateAi();
 
-  core::Angle headRot = 0_deg;
+  auto headRot = 0_deg;
   if(alive())
   {
     const ai::EnemyLocation enemyLocation{*this};
@@ -476,8 +476,8 @@ void TorsoBoss::update()
       }
       else
       {
-        const auto frameDelta = getSkeleton()->getFrame() - m_turnStartFrame;
-        if(frameDelta > 13_frame && frameDelta < 23_frame)
+        if(const auto frameDelta = getSkeleton()->getFrame() - m_turnStartFrame;
+           frameDelta > 13_frame && frameDelta < 23_frame)
         {
           m_state.rotation.Y -= 9_deg;
         }
@@ -493,8 +493,8 @@ void TorsoBoss::update()
       }
       else
       {
-        const auto frameDelta = getSkeleton()->getFrame() - m_turnStartFrame;
-        if(frameDelta > 16_frame && frameDelta < 23_frame)
+        if(const auto frameDelta = getSkeleton()->getFrame() - m_turnStartFrame;
+           frameDelta > 16_frame && frameDelta < 23_frame)
         {
           m_state.rotation.Y += 14_deg;
         }
@@ -522,7 +522,7 @@ void TorsoBoss::update()
       {
         goal(LaraKilled);
         auto& lara = getWorld().getObjectManager().getLara();
-        lara.getSkeleton()->setAnim(gsl::not_null{
+        lara.getSkeleton()->setAnim(gsl_lite::not_null{
           &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::AlternativeLara)->animations[0]});
         lara.setGoalAnimState(loader::file::LaraStateId::BoulderDeath);
         lara.setCurrentAnimState(loader::file::LaraStateId::BoulderDeath);
@@ -562,8 +562,8 @@ void TorsoBoss::update()
   {
     if(m_state.current_anim_state != BossKilled)
     {
-      getSkeleton()->setAnim(
-        gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::TorsoBoss)->animations[13]});
+      getSkeleton()->setAnim(gsl_lite::not_null{
+        &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::TorsoBoss)->animations[13]});
       m_state.current_anim_state = BossKilled;
     }
   }
@@ -571,12 +571,12 @@ void TorsoBoss::update()
   rotateCreatureHead(headRot);
   if(m_state.current_anim_state == Falling)
   {
-    ModelObject::update();
+    advanceFrame();
     if(m_state.location.position.Y > m_state.floor)
     {
       goal(Think);
       settle();
-      getWorld().getCameraController().setBounce(500_len);
+      getWorld().getCameraController().setShake(500_len);
     }
   }
   else
@@ -611,10 +611,10 @@ void TorsoBoss::deserialize(const serialization::Deserializer<world::World>& ser
 }
 
 WalkingMutant::WalkingMutant(const std::string& name,
-                             const gsl::not_null<world::World*>& world,
-                             const gsl::not_null<const world::Room*>& room,
+                             const gsl_lite::not_null<world::World*>& world,
+                             const gsl_lite::not_null<const world::Room*>& room,
                              const loader::file::Item& item,
-                             const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : FlyingMutant{name, world, room, item, animatedModel}
 {
   for(size_t i = 0; i < getSkeleton()->getBoneCount(); ++i)
@@ -623,4 +623,4 @@ WalkingMutant::WalkingMutant(const std::string& name,
   }
   getSkeleton()->rebuildMesh();
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/mutant.h b/src/engine/objects/mutant.h
index a7f648f8a..d3f1523cd 100644
--- a/src/engine/objects/mutant.h
+++ b/src/engine/objects/mutant.h
@@ -4,7 +4,7 @@
 #include "core/units.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -31,7 +31,7 @@ class FlyingMutant : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(FlyingMutant)
 
-  void update() final;
+  void updateLogic() final;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
@@ -46,16 +46,16 @@ class FlyingMutant : public AIAgent
 class WalkingMutant final : public FlyingMutant
 {
 public:
-  WalkingMutant(const gsl::not_null<world::World*>& world, const Location& location)
+  WalkingMutant(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : FlyingMutant{world, location}
   {
   }
 
   WalkingMutant(const std::string& name,
-                const gsl::not_null<world::World*>& world,
-                const gsl::not_null<const world::Room*>& room,
+                const gsl_lite::not_null<world::World*>& world,
+                const gsl_lite::not_null<const world::Room*>& room,
                 const loader::file::Item& item,
-                const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 };
 
 class CentaurMutant final : public AIAgent
@@ -63,7 +63,7 @@ class CentaurMutant final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(CentaurMutant)
 
-  void update() override;
+  void updateLogic() override;
 };
 
 class TorsoBoss final : public AIAgent
@@ -71,7 +71,7 @@ class TorsoBoss final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(TorsoBoss)
 
-  void update() override;
+  void updateLogic() override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
@@ -80,5 +80,4 @@ class TorsoBoss final : public AIAgent
   bool m_hasHitLara = false;
   core::Frame m_turnStartFrame = 0_frame;
 };
-
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/mutantegg.cpp b/src/engine/objects/mutantegg.cpp
index 605fa5ab2..a5e434861 100644
--- a/src/engine/objects/mutantegg.cpp
+++ b/src/engine/objects/mutantegg.cpp
@@ -30,7 +30,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -39,13 +39,13 @@
 namespace engine::objects
 {
 MutantEgg::MutantEgg(const std::string& name,
-                     const gsl::not_null<world::World*>& world,
-                     const gsl::not_null<const world::Room*>& room,
+                     const gsl_lite::not_null<world::World*>& world,
+                     const gsl_lite::not_null<const world::Room*>& room,
                      loader::file::Item item,
-                     const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                     const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
-  m_state.activationState = floordata::ActivationState(uint16_t(item.activationState & ~0x3e00u));
+  m_state.activationState = floordata::ActivationState(static_cast<uint16_t>(item.activationState & ~0x3e00u));
 
   switch((item.activationState & 0x3e00u) >> 9u)
   {
@@ -57,7 +57,7 @@ MutantEgg::MutantEgg(const std::string& name,
         world,
         room,
         item,
-        gsl::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::FlyingMutant).get()});
+        gsl_lite::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::FlyingMutant).get()});
     break;
   case 2:
     item.type = TR1ItemId::CentaurMutant;
@@ -67,7 +67,7 @@ MutantEgg::MutantEgg(const std::string& name,
         world,
         room,
         item,
-        gsl::not_null{world->getWorldGeometry().findAnimatedModelForType(item.type).get()});
+        gsl_lite::not_null{world->getWorldGeometry().findAnimatedModelForType(item.type).get()});
     break;
   case 4:
     item.type = TR1ItemId::TorsoBoss;
@@ -77,7 +77,7 @@ MutantEgg::MutantEgg(const std::string& name,
         world,
         room,
         item,
-        gsl::not_null{world->getWorldGeometry().findAnimatedModelForType(item.type).get()});
+        gsl_lite::not_null{world->getWorldGeometry().findAnimatedModelForType(item.type).get()});
     break;
   case 8:
     item.type = TR1ItemId::WalkingMutant2;
@@ -87,7 +87,7 @@ MutantEgg::MutantEgg(const std::string& name,
         world,
         room,
         item,
-        gsl::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::FlyingMutant).get()});
+        gsl_lite::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::FlyingMutant).get()});
     break;
   default:
     item.type = TR1ItemId::FlyingMutant;
@@ -97,7 +97,7 @@ MutantEgg::MutantEgg(const std::string& name,
         world,
         room,
         item,
-        gsl::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::FlyingMutant).get()});
+        gsl_lite::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::FlyingMutant).get()});
     break;
   }
 
@@ -107,19 +107,20 @@ MutantEgg::MutantEgg(const std::string& name,
   }
   else
   {
-    getWorld().getObjectManager().registerObject(gsl::not_null{m_childObject});
+    getWorld().getObjectManager().registerObject(gsl_lite::not_null{m_childObject});
     m_childObject->m_state.triggerState = TriggerState::Invisible;
   }
 
   for(size_t i = 0; i < getSkeleton()->getBoneCount(); ++i)
   {
+    // ReSharper disable once CppRedundantParentheses
     getSkeleton()->setVisible(i, (0xff0001ffu >> i) & 1u);
   }
   getSkeleton()->rebuildMesh();
   getSkeleton()->getRenderState().setScissorTest(false);
 }
 
-void MutantEgg::update()
+void MutantEgg::updateLogic()
 {
   if(m_state.goal_anim_state != 1_as)
   {
@@ -144,9 +145,9 @@ void MutantEgg::update()
         auto& childState = m_childObject->m_state;
         childState.location = m_state.location;
         childState.rotation.Y = m_state.rotation.Y;
-        addChild(gsl::not_null{m_state.location.room->node}, gsl::not_null{m_childObject->getNode()});
+        addChild(gsl_lite::not_null{m_state.location.room->node}, gsl_lite::not_null{m_childObject->getNode()});
 
-        m_childObject->applyTransform();
+        m_childObject->applyLogicTransform();
 
         childState.touch_bits.reset();
         m_childObject->initCreatureInfo();
@@ -156,7 +157,7 @@ void MutantEgg::update()
     }
   }
 
-  ModelObject::update();
+  advanceFrame();
 }
 
 void MutantEgg::collide(CollisionInfo& info)
@@ -181,4 +182,4 @@ void MutantEgg::deserialize(const serialization::Deserializer<world::World>& ser
     ser(S_NV("childObject", serialization::ObjectReference{std::ref(m_childObject)}));
   };
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/mutantegg.h b/src/engine/objects/mutantegg.h
index 7a20ca1af..814717dce 100644
--- a/src/engine/objects/mutantegg.h
+++ b/src/engine/objects/mutantegg.h
@@ -3,7 +3,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -32,18 +32,18 @@ class AIAgent;
 class MutantEgg final : public ModelObject
 {
 public:
-  MutantEgg(const gsl::not_null<world::World*>& world, const Location& location)
+  MutantEgg(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   MutantEgg(const std::string& name,
-            const gsl::not_null<world::World*>& world,
-            const gsl::not_null<const world::Room*>& room,
+            const gsl_lite::not_null<world::World*>& world,
+            const gsl_lite::not_null<const world::Room*>& room,
             loader::file::Item item,
-            const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+            const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& info) override;
 
@@ -53,4 +53,4 @@ class MutantEgg final : public ModelObject
 private:
   std::shared_ptr<AIAgent> m_childObject{nullptr};
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/natla.cpp b/src/engine/objects/natla.cpp
index a4ef62ff6..8088a44c0 100644
--- a/src/engine/objects/natla.cpp
+++ b/src/engine/objects/natla.cpp
@@ -25,28 +25,28 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <utility>
 
 namespace engine::objects
 {
-void Natla::update()
+void Natla::updateLogic()
 {
-  static constexpr const core::TRVec bulletEmissionPos{5_len, 220_len, 7_len};
-  static constexpr const size_t bulletEmissionBoneIdx = 4;
+  static constexpr core::TRVec bulletEmissionPos{5_len, 220_len, 7_len};
+  static constexpr size_t bulletEmissionBoneIdx = 4;
 
   activateAi();
 
-  static const constexpr auto AimDispatch = 1_as;
-  static const constexpr auto AimFlying = 2_as;
-  static const constexpr auto Running = 3_as;
-  static const constexpr auto AimWalking = 4_as;
-  static const constexpr auto Injured = 5_as;
-  static const constexpr auto Shoot = 6_as;
-  static const constexpr auto Falling = 7_as;
-  static const constexpr auto Standing = 8_as;
-  static const constexpr auto Dying = 9_as;
+  static constexpr auto AimDispatch = 1_as;
+  static constexpr auto AimFlying = 2_as;
+  static constexpr auto Running = 3_as;
+  static constexpr auto AimWalking = 4_as;
+  static constexpr auto Injured = 5_as;
+  static constexpr auto Shoot = 6_as;
+  static constexpr auto Falling = 7_as;
+  static constexpr auto Standing = 8_as;
+  static constexpr auto Dying = 9_as;
 
   auto tiltRot = 0_deg;
   auto turn = 0_deg;
@@ -111,7 +111,7 @@ void Natla::update()
 
       if(m_flyTime >= 1_sec * core::FrameRate)
       {
-        auto particle = emitParticle(bulletEmissionPos, bulletEmissionBoneIdx, &createMutantGrenade);
+        const auto particle = emitParticle(bulletEmissionPos, bulletEmissionBoneIdx, &createMutantGrenade);
         headRot = particle->angle.X;
         getWorld().getAudioEngine().playSoundEffect(TR1SoundEffect::MutantShootingBullet,
                                                     particle->location.position.toRenderSystem());
@@ -169,7 +169,7 @@ void Natla::update()
       tiltRot = turn;
       if(m_flyTime >= 1_sec * core::FrameRate * 2 / 3)
       {
-        auto particle = emitParticle(bulletEmissionPos, bulletEmissionBoneIdx, &createMutantBullet);
+        const auto particle = emitParticle(bulletEmissionPos, bulletEmissionBoneIdx, &createMutantBullet);
         headRot = particle->angle.X;
         getWorld().getAudioEngine().playSoundEffect(TR1SoundEffect::MutantShootingBullet,
                                                     particle->location.position.toRenderSystem());
@@ -214,7 +214,7 @@ void Natla::update()
 
       if(m_flyTime >= 1_sec * core::FrameRate * 2 / 3)
       {
-        auto particle = emitParticle(bulletEmissionPos, bulletEmissionBoneIdx, &createMutantBullet);
+        const auto particle = emitParticle(bulletEmissionPos, bulletEmissionBoneIdx, &createMutantBullet);
         headRot = particle->angle.X;
         getWorld().getAudioEngine().playSoundEffect(TR1SoundEffect::MutantShootingBullet,
                                                     particle->location.position.toRenderSystem());
@@ -247,4 +247,4 @@ void Natla::deserialize(const serialization::Deserializer<world::World>& ser)
   AIAgent::deserialize(ser);
   ser(S_NV("attemptToFly", m_attemptToFly), S_NV("flyTime", m_flyTime), S_NV("pitchDelta", m_pitchDelta));
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/natla.h b/src/engine/objects/natla.h
index 2a4972b36..d10bb50a8 100644
--- a/src/engine/objects/natla.h
+++ b/src/engine/objects/natla.h
@@ -23,7 +23,7 @@ class Natla final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Natla)
 
-  void update() override;
+  void updateLogic() override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
diff --git a/src/engine/objects/object.cpp b/src/engine/objects/object.cpp
index c710d7331..d0c298bec 100644
--- a/src/engine/objects/object.cpp
+++ b/src/engine/objects/object.cpp
@@ -29,7 +29,7 @@
 #include <glm/geometric.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 #include <string>
@@ -37,21 +37,46 @@
 namespace engine::objects
 {
 // NOLINTNEXTLINE(readability-make-member-function-const)
-void Object::applyTransform()
+void Object::applyLogicTransform()
 {
-  const glm::vec3 tr = m_state.location.position.toRenderSystem() - m_state.location.room->position.toRenderSystem();
-  getNode()->setLocalMatrix(translate(glm::mat4{1.0f}, tr) * m_state.rotation.toMatrix());
+  updatePrediction();
+  interpolateTransform(0);
 }
 
-Object::Object(const gsl::not_null<world::World*>& world, const Location& location)
+// NOLINTNEXTLINE(readability-make-member-function-const)
+void Object::interpolateTransform(const float interTickFactor)
+{
+  const auto pos = core::lerp(m_state.location.position, m_state.predictedPosition, interTickFactor);
+  const auto rot = core::lerp(m_state.rotation, m_state.predictedRotation, interTickFactor);
+  const auto tr = pos.toRenderSystem() - m_state.location.room->position.toRenderSystem();
+  getNode()->setLocalMatrix(translate(glm::mat4{1.0f}, tr) * rot.toMatrix());
+}
+
+void Object::updatePrediction()
+{
+  m_state.predictedPosition = m_state.location.position;
+  m_state.predictedRotation = m_state.rotation;
+
+  if(m_state.speed != 0_spd)
+  {
+    m_state.predictedPosition += util::pitch(m_state.speed * 1_frame, getMovementAngle());
+  }
+
+  if(m_state.falling && m_state.fallspeed != 0_spd)
+  {
+    m_state.predictedPosition.Y += m_state.fallspeed * 1_frame;
+  }
+}
+
+Object::Object(const gsl_lite::not_null<world::World*>& world, const Location& location)
     : m_world{world}
-    , m_state{gsl::not_null{world->getPresenter().getSoundEngine().get()}, location}
+    , m_state{gsl_lite::not_null{world->getEngine().getPresenter().getSoundEngine().get().get()}, location}
     , m_hasUpdateFunction{false}
 {
 }
 
-Object::Object(const gsl::not_null<world::World*>& world,
-               const gsl::not_null<const world::Room*>& room,
+Object::Object(const gsl_lite::not_null<world::World*>& world,
+               const gsl_lite::not_null<const world::Room*>& room,
                const loader::file::Item& item,
                const bool hasUpdateFunction)
     : Object{world, Location{room, item.position}}
@@ -89,12 +114,12 @@ Object::Object(const gsl::not_null<world::World*>& world,
   }
 }
 
-void Object::setCurrentRoom(const gsl::not_null<const world::Room*>& newRoom)
+void Object::setCurrentRoom(const gsl_lite::not_null<const world::Room*>& newRoom)
 {
-  setParent(gsl::not_null{getNode()}, newRoom->node);
+  setParent(gsl_lite::not_null{getNode()}, newRoom->node);
 
   m_state.location.room = newRoom;
-  applyTransform();
+  applyLogicTransform();
 }
 
 void Object::activate()
@@ -160,9 +185,9 @@ bool Object::triggerPickUp() noexcept
 
 bool InteractionLimits::canInteract(const ObjectState& objectState, const ObjectState& laraState) const
 {
-  const auto angle = laraState.rotation - objectState.rotation;
-  if(angle.X < minAngle.X || angle.X > maxAngle.X || angle.Y < minAngle.Y || angle.Y > maxAngle.Y
-     || angle.Z < minAngle.Z || angle.Z > maxAngle.Z)
+  if(const auto angle = laraState.rotation - objectState.rotation; angle.X < minAngle.X || angle.X > maxAngle.X
+                                                                   || angle.Y < minAngle.Y || angle.Y > maxAngle.Y
+                                                                   || angle.Z < minAngle.Z || angle.Z > maxAngle.Z)
   {
     return false;
   }
@@ -174,10 +199,10 @@ bool InteractionLimits::canInteract(const ObjectState& objectState, const Object
 
 void Object::emitRicochet(const Location& location)
 {
-  const auto particle = gsl::make_shared<RicochetParticle>(location, getWorld());
+  const auto particle = gsl_lite::make_shared<RicochetParticle>(location, getWorld());
   setParent(particle, m_state.location.room->node);
   getWorld().getObjectManager().registerParticle(particle);
-  getWorld().getAudioEngine().playSoundEffect(TR1SoundEffect::Ricochet, gsl::not_null{particle.get().get()});
+  getWorld().getAudioEngine().playSoundEffect(TR1SoundEffect::Ricochet, gsl_lite::not_null{particle.get().get()});
 }
 
 std::optional<core::Length> Object::getWaterSurfaceHeight() const
@@ -191,8 +216,7 @@ bool Object::alignTransformClamped(const core::TRVec& targetPos,
                                    const core::Angle& maxAngle)
 {
   auto d = targetPos - m_state.location.position;
-  const auto dist = length(d);
-  if(maxDistance < dist)
+  if(const auto dist = length(d); maxDistance < dist)
   {
     m_state.location.move(maxDistance.cast<float>().get() * normalize(d.toRenderSystem()));
   }
@@ -231,9 +255,9 @@ void Object::deserialize(const serialization::Deserializer<world::World>& ser)
 
   ser << [this](const serialization::Deserializer<world::World>& /*ser*/)
   {
-    setParent(gsl::not_null{getNode()}, m_state.location.room->node);
+    setParent(gsl_lite::not_null{getNode()}, m_state.location.room->node);
 
-    applyTransform();
+    applyLogicTransform();
   };
 }
 
@@ -246,4 +270,4 @@ std::string makeObjectName(const TR1ItemId type, const size_t id)
 {
   return "#" + std::to_string(id) + " " + toString(type);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/object.h b/src/engine/objects/object.h
index 369ef0113..6e98d932f 100644
--- a/src/engine/objects/object.h
+++ b/src/engine/objects/object.h
@@ -18,7 +18,7 @@
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 #include <string>
@@ -50,6 +50,11 @@ namespace render::scene
 class Node;
 }
 
+namespace hid
+{
+class InputHandler;
+}
+
 namespace engine::objects
 {
 struct InteractionLimits
@@ -71,10 +76,10 @@ struct InteractionLimits
 
 class Object
 {
-  gsl::not_null<world::World*> m_world;
+  gsl_lite::not_null<world::World*> m_world;
 
 protected:
-  Object(const gsl::not_null<world::World*>& world, const Location& location);
+  Object(const gsl_lite::not_null<world::World*>& world, const Location& location);
 
 public:
   ObjectState m_state;
@@ -91,8 +96,8 @@ class Object
     Interact = 7
   };
 
-  Object(const gsl::not_null<world::World*>& world,
-         const gsl::not_null<const world::Room*>& room,
+  Object(const gsl_lite::not_null<world::World*>& world,
+         const gsl_lite::not_null<const world::Room*>& room,
          const loader::file::Item& item,
          bool hasUpdateFunction);
 
@@ -102,13 +107,16 @@ class Object
 
   virtual ~Object() = default;
 
-  virtual void update() = 0;
+  virtual void updateLogic() = 0;
 
   virtual std::shared_ptr<render::scene::Node> getNode() const = 0;
 
-  void setCurrentRoom(const gsl::not_null<const world::Room*>& newRoom);
+  void setCurrentRoom(const gsl_lite::not_null<const world::Room*>& newRoom);
+
+  void applyLogicTransform();
+  void interpolateTransform(float interTickFactor);
 
-  void applyTransform();
+  virtual void updatePrediction();
 
   void rotate(const core::RotationSpeed& dx, const core::RotationSpeed& dy, const core::RotationSpeed& dz) noexcept
   {
@@ -200,4 +208,4 @@ class Object
 };
 
 extern std::string makeObjectName(TR1ItemId type, size_t id);
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/objectfactory.cpp b/src/engine/objects/objectfactory.cpp
index f81212569..e58b0826e 100644
--- a/src/engine/objects/objectfactory.cpp
+++ b/src/engine/objects/objectfactory.cpp
@@ -75,8 +75,9 @@
 #include <boost/assert.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/throw_exception.hpp>
+#include <concepts>
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 #include <memory>
@@ -100,15 +101,14 @@ struct ObjectFactory
 };
 
 /* NOLINTNEXTLINE(altera-struct-pack-align) */
-struct UnsupportedObjectFactory : public ObjectFactory
+struct UnsupportedObjectFactory : ObjectFactory
 {
   ~UnsupportedObjectFactory() override = default;
 
   [[nodiscard]] [[noreturn]] gslu::nn_shared<Object>
     createNew(world::World& /*world*/, loader::file::Item& item, size_t /*id*/) const override
   {
-    BOOST_LOG_TRIVIAL(fatal) << "Object type " << toString(item.type.get_as<engine::TR1ItemId>())
-                             << " is not supported";
+    BOOST_LOG_TRIVIAL(fatal) << "Object type " << toString(item.type.get_as<TR1ItemId>()) << " is not supported";
     BOOST_THROW_EXCEPTION(std::runtime_error("unsupported object type"));
   }
 
@@ -121,19 +121,22 @@ struct UnsupportedObjectFactory : public ObjectFactory
   }
 };
 
-template<typename T>
+template<std::derived_from<ModelObject> T>
 /* NOLINTNEXTLINE(altera-struct-pack-align) */
-struct ModelFactory : public ObjectFactory
+struct ModelFactory : ObjectFactory
 {
   [[nodiscard]] gslu::nn_shared<Object>
-    createNew(world::World& world, loader::file::Item& item, size_t id) const override
+    createNew(world::World& world, loader::file::Item& item, const size_t id) const override
   {
-    const auto room = gsl::not_null{&world.getRooms().at(item.room.get())};
+    const auto room = gsl_lite::not_null{&world.getRooms().at(item.room.get())};
     const auto& model = world.getWorldGeometry().findAnimatedModelForType(item.type);
     gsl_Assert(model != nullptr);
-    auto object = gsl::make_shared<T>(
-      makeObjectName(item.type.get_as<TR1ItemId>(), id), gsl::not_null{&world}, room, item, gsl::not_null{model.get()});
-    addChild(gsl::not_null{room->node}, gsl::not_null{object->getNode()});
+    auto object = gsl_lite::make_shared<T>(makeObjectName(item.type.get_as<TR1ItemId>(), id),
+                                           gsl_lite::not_null{&world},
+                                           room,
+                                           item,
+                                           gsl_lite::not_null{model.get()});
+    addChild(gsl_lite::not_null{room->node}, gsl_lite::not_null{object->getNode()});
 
     world.getEngine()
       .getScriptEngine()
@@ -142,34 +145,37 @@ struct ModelFactory : public ObjectFactory
       .at(item.type.get_as<TR1ItemId>())
       ->customize(object);
 
-    object->applyTransform();
+    object->applyLogicTransform();
     return object;
   }
 
   [[nodiscard]] gslu::nn_shared<Object>
     createFromSave(const Location& location, const serialization::Deserializer<world::World>& ser) const override
   {
-    auto object = gsl::make_shared<T>(ser.context, location);
+    auto object = gsl_lite::make_shared<T>(ser.context, location);
     object->deserialize(ser);
     return object;
   }
 };
 
-template<typename T>
+template<std::derived_from<SpriteObject> T>
 /* NOLINTNEXTLINE(altera-struct-pack-align) */
-struct SpriteFactory : public ObjectFactory
+struct SpriteFactory : ObjectFactory
 {
   [[nodiscard]] gslu::nn_shared<Object>
-    createNew(world::World& world, loader::file::Item& item, size_t id) const override
+    createNew(world::World& world, loader::file::Item& item, const size_t id) const override
   {
-    const auto room = gsl::not_null{&world.getRooms().at(item.room.get())};
+    const auto room = gsl_lite::not_null{&world.getRooms().at(item.room.get())};
 
     const auto& spriteSequence = world.getWorldGeometry().findSpriteSequenceForType(item.type);
     gsl_Assert(spriteSequence != nullptr && !spriteSequence->sprites.empty());
 
     const world::Sprite& sprite = spriteSequence->sprites[0];
-    auto object = gsl::make_shared<T>(
-      makeObjectName(item.type.get_as<TR1ItemId>(), id), gsl::not_null{&world}, room, item, gsl::not_null{&sprite});
+    auto object = gsl_lite::make_shared<T>(makeObjectName(item.type.get_as<TR1ItemId>(), id),
+                                           gsl_lite::not_null{&world},
+                                           room,
+                                           item,
+                                           gsl_lite::not_null{&sprite});
 
     world.getEngine()
       .getScriptEngine()
@@ -186,7 +192,7 @@ struct SpriteFactory : public ObjectFactory
   {
     std::string spriteName;
     ser(S_NV("@name", spriteName));
-    auto object = gsl::make_shared<T>(spriteName, ser.context, location);
+    auto object = gsl_lite::make_shared<T>(spriteName, ser.context, location);
     object->deserialize(ser);
     return object;
   }
@@ -203,17 +209,20 @@ struct SpriteFactory : public ObjectFactory
 #define UNSUPPORTED_FACTORY(ENUM) {TR1ItemId::_PAREN_WRAPPER(ENUM), std::make_shared<UnsupportedObjectFactory>()}
 
 /* NOLINTNEXTLINE(altera-struct-pack-align) */
-struct WalkingMutantFactory : public ObjectFactory
+struct WalkingMutantFactory : ObjectFactory
 {
   [[nodiscard]] gslu::nn_shared<Object>
-    createNew(world::World& world, loader::file::Item& item, size_t id) const override
+    createNew(world::World& world, loader::file::Item& item, const size_t id) const override
   {
-    const auto room = gsl::not_null{&world.getRooms().at(item.room.get())};
+    const auto room = gsl_lite::not_null{&world.getRooms().at(item.room.get())};
     const auto& model = world.getWorldGeometry().findAnimatedModelForType(TR1ItemId::FlyingMutant);
     gsl_Assert(model != nullptr);
-    auto object = gsl::make_shared<WalkingMutant>(
-      makeObjectName(item.type.get_as<TR1ItemId>(), id), gsl::not_null{&world}, room, item, gsl::not_null{model.get()});
-    addChild(gsl::not_null{room->node}, gsl::not_null{object->getNode()});
+    auto object = gsl_lite::make_shared<WalkingMutant>(makeObjectName(item.type.get_as<TR1ItemId>(), id),
+                                                       gsl_lite::not_null{&world},
+                                                       room,
+                                                       item,
+                                                       gsl_lite::not_null{model.get()});
+    addChild(gsl_lite::not_null{room->node}, gsl_lite::not_null{object->getNode()});
 
     world.getEngine()
       .getScriptEngine()
@@ -222,26 +231,26 @@ struct WalkingMutantFactory : public ObjectFactory
       .at(item.type.get_as<TR1ItemId>())
       ->customize(object);
 
-    object->applyTransform();
+    object->applyLogicTransform();
     return object;
   }
 
   [[nodiscard]] gslu::nn_shared<Object>
     createFromSave(const Location& location, const serialization::Deserializer<world::World>& ser) const override
   {
-    auto object = gsl::make_shared<WalkingMutant>(ser.context, location);
+    auto object = gsl_lite::make_shared<WalkingMutant>(ser.context, location);
     object->deserialize(ser);
     return object;
   }
 };
 
 /* NOLINTNEXTLINE(altera-struct-pack-align) */
-struct HiddenModelFactory : public ModelFactory<StubObject>
+struct HiddenModelFactory : ModelFactory<StubObject>
 {
   [[nodiscard]] gslu::nn_shared<Object>
-    createNew(world::World& world, loader::file::Item& item, size_t id) const override
+    createNew(world::World& world, loader::file::Item& item, const size_t id) const override
   {
-    auto object = gslu::static_pointer_cast<StubObject>(ModelFactory<StubObject>::createNew(world, item, id));
+    auto object = gslu::static_pointer_cast<StubObject>(ModelFactory::createNew(world, item, id));
     object->getSkeleton()->setRenderable(nullptr);
     object->getSkeleton()->clearParts();
 
@@ -258,7 +267,7 @@ struct HiddenModelFactory : public ModelFactory<StubObject>
   [[nodiscard]] gslu::nn_shared<Object>
     createFromSave(const Location& location, const serialization::Deserializer<world::World>& ser) const override
   {
-    auto object = gslu::static_pointer_cast<StubObject>(ModelFactory<StubObject>::createFromSave(location, ser));
+    auto object = gslu::static_pointer_cast<StubObject>(ModelFactory::createFromSave(location, ser));
     object->getSkeleton()->setRenderable(nullptr);
     object->getSkeleton()->clearParts();
     return object;
@@ -398,33 +407,36 @@ const auto& getFactories()
   return factories;
 }
 
-ObjectFactory* findFactory(TR1ItemId type)
+ObjectFactory* findFactory(const TR1ItemId type)
 {
   const auto& factories = getFactories();
 
-  if(auto it = factories.find(type); it != factories.end())
+  if(const auto it = factories.find(type); it != factories.end())
     return it->second.get();
 
   return nullptr;
 }
 } // namespace
 
-std::shared_ptr<Object> createObject(world::World& world, loader::file::Item& item, size_t id)
+std::shared_ptr<Object> createObject(world::World& world, loader::file::Item& item, const size_t id)
 {
   if(const auto factory = findFactory(item.type.get_as<TR1ItemId>()))
     return factory->createNew(world, item, id);
 
-  const auto room = gsl::not_null{&world.getRooms().at(item.room.get())};
+  const auto room = gsl_lite::not_null{&world.getRooms().at(item.room.get())};
 
   if(const auto& model = world.getWorldGeometry().findAnimatedModelForType(item.type))
   {
-    auto object = std::make_shared<StubObject>(
-      makeObjectName(item.type.get_as<TR1ItemId>(), id), gsl::not_null{&world}, room, item, gsl::not_null{model.get()});
+    auto object = std::make_shared<StubObject>(makeObjectName(item.type.get_as<TR1ItemId>(), id),
+                                               gsl_lite::not_null{&world},
+                                               room,
+                                               item,
+                                               gsl_lite::not_null{model.get()});
     BOOST_LOG_TRIVIAL(warning) << "Unimplemented object type " << toString(item.type.get_as<TR1ItemId>());
 
-    addChild(gsl::not_null{room->node}, gsl::not_null{object->getNode()});
+    addChild(gsl_lite::not_null{room->node}, gsl_lite::not_null{object->getNode()});
 
-    object->applyTransform();
+    object->applyLogicTransform();
 
     return object;
   }
@@ -437,15 +449,16 @@ std::shared_ptr<Object> createObject(world::World& world, loader::file::Item& it
 
     BOOST_LOG_TRIVIAL(warning) << "Unimplemented object type " << toString(item.type.get_as<TR1ItemId>());
     return std::make_shared<SpriteObject>(makeObjectName(item.type.get_as<TR1ItemId>(), id),
-                                          gsl::not_null{&world},
+                                          gsl_lite::not_null{&world},
                                           room,
                                           item,
                                           true,
-                                          gsl::not_null{&sprite},
+                                          gsl_lite::not_null{&sprite},
                                           false);
   }
 
-  BOOST_LOG_TRIVIAL(error) << "Failed to find an appropriate animated model for object type " << int(item.type.get());
+  BOOST_LOG_TRIVIAL(error) << "Failed to find an appropriate animated model for object type "
+                           << static_cast<int>(item.type.get());
   return nullptr;
 }
 
@@ -474,4 +487,4 @@ void serialization::deserialize(std::shared_ptr<engine::objects::Object>& ptr,
 {
   gsl_Expects(ptr != nullptr);
   ptr->deserialize(ser);
-}
+}
\ No newline at end of file
diff --git a/src/engine/objects/objectstate.cpp b/src/engine/objects/objectstate.cpp
index 0c84a717e..2a852d374 100644
--- a/src/engine/objects/objectstate.cpp
+++ b/src/engine/objects/objectstate.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/throw_exception.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <map>
 #include <stdexcept>
 
@@ -143,18 +143,18 @@ const world::Sector* ObjectState::getCurrentSector() const
   return location.room->getSectorByAbsolutePosition(location.position);
 }
 
-gsl::not_null<const world::Box*> ObjectState::getCurrentBox() const
+gsl_lite::not_null<const world::Box*> ObjectState::getCurrentBox() const
 {
-  return gsl::not_null{tryGetCurrentBox()};
+  return gsl_lite::not_null{tryGetCurrentBox()};
 }
 
 const world::Box* ObjectState::tryGetCurrentBox() const
 {
-  const gsl::not_null sector{getCurrentSector()};
+  const gsl_lite::not_null sector{getCurrentSector()};
   return sector->box;
 }
 
-void ObjectState::hitLara(const core::Health& damage, bool noHits)
+void ObjectState::hitLara(const core::Health& damage, const bool noHits)
 {
   BOOST_ASSERT(damage >= 0_hp);
   if(damage > 0_hp && noHits)
@@ -167,4 +167,4 @@ void ObjectState::hitLara(const core::Health& damage, bool noHits)
   }
   is_hit = true;
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/objectstate.h b/src/engine/objects/objectstate.h
index 96ccd48b0..bf43a7365 100644
--- a/src/engine/objects/objectstate.h
+++ b/src/engine/objects/objectstate.h
@@ -12,7 +12,7 @@
 #include <bitset>
 #include <cstdint>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <utility>
 
 namespace audio
@@ -45,20 +45,22 @@ enum class TriggerState : uint8_t
 
 class Object;
 
-struct ObjectState final : public audio::Emitter
+struct ObjectState final : audio::Emitter
 {
 private:
   friend Object;
 
-  explicit ObjectState(const gsl::not_null<audio::SoundEngine*>& engine, Location location)
+  explicit ObjectState(const gsl_lite::not_null<audio::SoundEngine*>& engine, Location location)
       : Emitter{engine}
       , location{std::move(location)}
+      , predictedPosition{location.position}
   {
   }
 
 public:
-  explicit ObjectState(const gsl::not_null<audio::SoundEngine*>& engine,
-                       const gsl::not_null<const world::Room*>& room,
+  /// Deserialization constructor. Fields will be populated by deserialization code.
+  explicit ObjectState(const gsl_lite::not_null<audio::SoundEngine*>& engine,
+                       const gsl_lite::not_null<const world::Room*>& room,
                        const core::TypeId& type)
       : Emitter{engine}
       , type{type}
@@ -75,9 +77,11 @@ struct ObjectState final : public audio::Emitter
 
   glm::vec3 getPosition() const override;
 
-  core::TypeId type = core::TypeId{uint16_t(-1)};
+  core::TypeId type = core::TypeId{static_cast<uint16_t>(-1)};
   Location location;
+  core::TRVec predictedPosition;
   core::TRRotation rotation;
+  core::TRRotation predictedRotation;
   core::Speed speed = 0_spd;
   core::Speed fallspeed = 0_spd;
   core::AnimStateId current_anim_state = 0_as;
@@ -131,9 +135,9 @@ struct ObjectState final : public audio::Emitter
     return health <= 0_hp;
   }
 
-  gsl::not_null<const world::Box*> getCurrentBox() const;
+  gsl_lite::not_null<const world::Box*> getCurrentBox() const;
   const world::Box* tryGetCurrentBox() const;
 
   void hitLara(const core::Health& damage, bool noHits);
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/pickupobject.cpp b/src/engine/objects/pickupobject.cpp
index 3f214b77c..ba8bd5c2c 100644
--- a/src/engine/objects/pickupobject.cpp
+++ b/src/engine/objects/pickupobject.cpp
@@ -6,6 +6,7 @@
 #include "core/id.h"
 #include "core/units.h"
 #include "core/vec.h"
+#include "engine/engine.h"
 #include "engine/inventory.h"
 #include "engine/items_tr1.h"
 #include "engine/objectmanager.h"
@@ -50,7 +51,7 @@ void PickupObject::collide(CollisionInfo& /*collisionInfo*/)
       return;
     }
 
-    static const core::GenericVec<core::Speed> aimSpeed{0_spd, -200_spd, -350_spd};
+    static constexpr core::GenericVec aimSpeed{0_spd, -200_spd, -350_spd};
 
     if(getWorld().getObjectManager().getLara().getCurrentAnimState() == loader::file::LaraStateId::PickUp)
     {
@@ -77,7 +78,7 @@ void PickupObject::collide(CollisionInfo& /*collisionInfo*/)
       getWorld().getObjectManager().getLara().setGoalAnimState(loader::file::LaraStateId::PickUp);
       do
       {
-        getWorld().getObjectManager().getLara().advanceFrame();
+        getWorld().getObjectManager().getLara().advanceLaraFrame();
       } while(getWorld().getObjectManager().getLara().getCurrentAnimState() != loader::file::LaraStateId::PickUp);
       getWorld().getObjectManager().getLara().setGoalAnimState(loader::file::LaraStateId::UnderwaterStop);
     }
@@ -108,7 +109,7 @@ void PickupObject::collide(CollisionInfo& /*collisionInfo*/)
         getWorld().getObjectManager().getLara().setGoalAnimState(loader::file::LaraStateId::PickUp);
         do
         {
-          getWorld().getObjectManager().getLara().advanceFrame();
+          getWorld().getObjectManager().getLara().advanceLaraFrame();
         } while(getWorld().getObjectManager().getLara().getCurrentAnimState() != loader::file::LaraStateId::PickUp);
         getWorld().getObjectManager().getLara().setGoalAnimState(loader::file::LaraStateId::Stop);
         getWorld().getObjectManager().getLara().setHandStatus(HandStatus::Grabbing);
diff --git a/src/engine/objects/pierre.cpp b/src/engine/objects/pierre.cpp
index 25a4b50d5..b7fabdc28 100644
--- a/src/engine/objects/pierre.cpp
+++ b/src/engine/objects/pierre.cpp
@@ -24,13 +24,13 @@
 #include "util/helpers.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 
 namespace engine::objects
 {
-void Pierre::update()
+void Pierre::updateLogic()
 {
   if(getWorld().getPierre() == nullptr)
   {
@@ -53,9 +53,9 @@ void Pierre::update()
 
   activateAi();
 
-  core::Angle tiltRot = 0_deg;
-  core::Angle turn = 0_deg;
-  core::Angle headRot = 0_deg;
+  auto tiltRot = 0_deg;
+  auto turn = 0_deg;
+  auto headRot = 0_deg;
   if(m_state.health <= 40_hp && !m_state.activationState.isOneshot())
   {
     m_state.health = 40_hp;
@@ -155,7 +155,7 @@ void Pierre::update()
   else if(m_state.current_anim_state != 5_as) // injured/dying
   {
     getSkeleton()->setAnim(
-      gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Pierre)->animations[12]});
+      gsl_lite::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Pierre)->animations[12]});
     m_state.current_anim_state = 5_as;
     getWorld().createPickup(TR1ItemId::MagnumsSprite, m_state.location.room, m_state.location.position);
     getWorld().createPickup(TR1ItemId::ScionPiece2, m_state.location.room, m_state.location.position);
@@ -202,4 +202,4 @@ void Pierre::deserialize(const serialization::Deserializer<world::World>& ser)
   AIAgent::deserialize(ser);
   ser(S_NV("fleeTime", m_fleeTime));
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/pierre.h b/src/engine/objects/pierre.h
index afd708c5b..a754fc913 100644
--- a/src/engine/objects/pierre.h
+++ b/src/engine/objects/pierre.h
@@ -23,7 +23,7 @@ class Pierre final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Pierre)
 
-  void update() override;
+  void updateLogic() override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
diff --git a/src/engine/objects/puzzlehole.cpp b/src/engine/objects/puzzlehole.cpp
index f2b0257cf..fe232f946 100644
--- a/src/engine/objects/puzzlehole.cpp
+++ b/src/engine/objects/puzzlehole.cpp
@@ -5,6 +5,7 @@
 #include "core/id.h"
 #include "core/units.h"
 #include "core/vec.h"
+#include "engine/engine.h"
 #include "engine/inventory.h"
 #include "engine/items_tr1.h"
 #include "engine/lighting.h"
@@ -27,7 +28,7 @@
 #include "render/scene/node.h"
 
 #include <boost/throw_exception.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <stdexcept>
 #include <string>
@@ -51,8 +52,8 @@ void PuzzleHole::collide(CollisionInfo& /*collisionInfo*/)
                                         core::TRRotation{-10_deg, -30_deg, -10_deg},
                                         core::TRRotation{10_deg, 30_deg, 10_deg}};
 
-  auto& lara = getWorld().getObjectManager().getLara();
-  if(lara.getCurrentAnimState() == loader::file::LaraStateId::Stop)
+  if(auto& lara = getWorld().getObjectManager().getLara();
+     lara.getCurrentAnimState() == loader::file::LaraStateId::Stop)
   {
     if(!getWorld().getPresenter().getInputHandler().hasAction(hid::Action::Action)
        || lara.getHandStatus() != HandStatus::None || lara.m_state.falling
@@ -94,7 +95,7 @@ void PuzzleHole::collide(CollisionInfo& /*collisionInfo*/)
     do
     {
       lara.setGoalAnimState(loader::file::LaraStateId::InsertPuzzle);
-      lara.advanceFrame();
+      lara.advanceLaraFrame();
     } while(lara.getCurrentAnimState() != loader::file::LaraStateId::InsertPuzzle);
 
     lara.setGoalAnimState(loader::file::LaraStateId::Stop);
@@ -105,25 +106,31 @@ void PuzzleHole::collide(CollisionInfo& /*collisionInfo*/)
           && lara.getSkeleton()->getFrame() == 3372_frame && limits.canInteract(m_state, lara.m_state))
   {
     swapPuzzleState();
+    advanceFrame();
   }
 }
 
+void PuzzleHole::updateLogic()
+{
+  advanceFrame();
+}
+
 void PuzzleHole::initMesh()
 {
   const auto& model = getWorld().getWorldGeometry().findAnimatedModelForType(m_state.type);
   gsl_Assert(model != nullptr);
 
   const auto parent = m_skeleton->getParent().lock();
-  setParent(gsl::not_null{m_skeleton}, nullptr);
-  m_skeleton = std::make_shared<SkeletalModelNode>(
-    toString(m_state.type.get_as<TR1ItemId>()), gsl::not_null{&getWorld()}, gsl::not_null{model.get()}, false);
+  setParent(gsl_lite::not_null{m_skeleton}, nullptr);
+  m_skeleton = std::make_shared<SkeletalModelNode>(toString(m_state.type.get_as<TR1ItemId>()),
+                                                   gsl_lite::not_null{&getWorld()},
+                                                   gsl_lite::not_null{model.get()},
+                                                   false);
   m_skeleton->setAnimation(
-    m_state.current_anim_state, gsl::not_null{&model->animations[0]}, model->animations->firstFrame);
-  setParent(gsl::not_null{m_skeleton}, parent);
+    m_state.current_anim_state, gsl_lite::not_null{&model->animations[0]}, model->animations->firstFrame);
+  setParent(gsl_lite::not_null{m_skeleton}, parent);
   SkeletalModelNode::buildMesh(m_skeleton, m_state.current_anim_state);
   m_lighting.bind(*m_skeleton, getWorld());
-
-  ModelObject::update();
 }
 
 void PuzzleHole::swapPuzzleState()
@@ -162,17 +169,18 @@ void PuzzleHole::swapPuzzleState()
 }
 
 PuzzleHole::PuzzleHole(const std::string& name,
-                       const gsl::not_null<world::World*>& world,
-                       const gsl::not_null<const world::Room*>& room,
+                       const gsl_lite::not_null<world::World*>& world,
+                       const gsl_lite::not_null<const world::Room*>& room,
                        const loader::file::Item& item,
-                       const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                       const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, false, animatedModel, false}
 {
   initMesh();
+  advanceFrame();
 }
 
-PuzzleHole::PuzzleHole(const gsl::not_null<world::World*>& world, const Location& location)
+PuzzleHole::PuzzleHole(const gsl_lite::not_null<world::World*>& world, const Location& location)
     : ModelObject{world, location}
 {
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/puzzlehole.h b/src/engine/objects/puzzlehole.h
index cb8bff0ab..17d8d078a 100644
--- a/src/engine/objects/puzzlehole.h
+++ b/src/engine/objects/puzzlehole.h
@@ -2,7 +2,7 @@
 
 #include "modelobject.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -28,18 +28,20 @@ namespace engine::objects
 class PuzzleHole final : public ModelObject
 {
 public:
-  PuzzleHole(const gsl::not_null<world::World*>& world, const Location& location);
+  PuzzleHole(const gsl_lite::not_null<world::World*>& world, const Location& location);
 
   PuzzleHole(const std::string& name,
-             const gsl::not_null<world::World*>& world,
-             const gsl::not_null<const world::Room*>& room,
+             const gsl_lite::not_null<world::World*>& world,
+             const gsl_lite::not_null<const world::Room*>& room,
              const loader::file::Item& item,
-             const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
   void collide(CollisionInfo& collisionInfo) override;
 
+  void updateLogic() override;
+
 private:
   void swapPuzzleState();
   void initMesh();
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/raptor.cpp b/src/engine/objects/raptor.cpp
index bf74c293b..d70f07e0c 100644
--- a/src/engine/objects/raptor.cpp
+++ b/src/engine/objects/raptor.cpp
@@ -14,18 +14,18 @@
 #include "qs/qs.h"
 #include "util/helpers.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::objects
 {
-void Raptor::update()
+void Raptor::updateLogic()
 {
   activateAi();
 
-  core::Angle roll = 0_deg;
-  core::Angle turn = 0_deg;
-  core::Angle animHead = 0_deg;
+  auto roll = 0_deg;
+  auto turn = 0_deg;
+  auto animHead = 0_deg;
   if(alive())
   {
     const ai::EnemyLocation enemyLocation{*this};
@@ -122,7 +122,7 @@ void Raptor::update()
   }
   else if(m_state.current_anim_state != 5_as)
   {
-    getSkeleton()->setAnim(gsl::not_null{
+    getSkeleton()->setAnim(gsl_lite::not_null{
       &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Raptor)->animations[9 + util::rand15(2)]});
     m_state.current_anim_state = 5_as;
   }
@@ -132,4 +132,4 @@ void Raptor::update()
   getSkeleton()->patchBone(20, core::TRRotation{0_deg, getCreatureInfo()->headRotation, 0_deg}.toMatrix());
   animateCreature(turn, roll);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/raptor.h b/src/engine/objects/raptor.h
index f72d2e191..3e4d8c2e0 100644
--- a/src/engine/objects/raptor.h
+++ b/src/engine/objects/raptor.h
@@ -21,6 +21,6 @@ class Raptor final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Raptor)
 
-  void update() override;
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/rat.cpp b/src/engine/objects/rat.cpp
index 84a8d5601..eeaaf5f56 100644
--- a/src/engine/objects/rat.cpp
+++ b/src/engine/objects/rat.cpp
@@ -19,14 +19,14 @@
 #include "util/helpers.h"
 
 #include <boost/assert.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 #include <utility>
 
 namespace engine::objects
 {
-void Rat::update()
+void Rat::updateLogic()
 {
   activateAi();
 
@@ -35,7 +35,7 @@ void Rat::update()
     if(alive())
     {
       const ai::EnemyLocation enemyLocation{*this};
-      core::Angle headRot = 0_deg;
+      auto headRot = 0_deg;
       if(enemyLocation.laraInView)
       {
         headRot = enemyLocation.visualAngleToLara;
@@ -68,8 +68,8 @@ void Rat::update()
       if(!waterHeight.has_value())
       {
         m_state.type = TR1ItemId::RatOnLand;
-        getSkeleton()->setAnim(
-          gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::RatOnLand)->animations[0]});
+        getSkeleton()->setAnim(gsl_lite::not_null{
+          &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::RatOnLand)->animations[0]});
         goal(getSkeleton()->getAnim()->state_id);
         m_state.current_anim_state = getSkeleton()->getAnim()->state_id;
 
@@ -92,19 +92,19 @@ void Rat::update()
           m_state.location.position.Y = *waterHeight;
         }
       }
-      applyTransform();
+      applyLogicTransform();
     }
     else
     {
       if(m_state.current_anim_state != 3_as)
       {
-        getSkeleton()->setAnim(
-          gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::RatInWater)->animations[2]});
+        getSkeleton()->setAnim(gsl_lite::not_null{
+          &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::RatInWater)->animations[2]});
         m_state.current_anim_state = 3_as;
       }
       rotateCreatureHead(0_deg);
       getSkeleton()->patchBone(2, core::TRRotation{0_deg, getCreatureInfo()->headRotation, 0_deg}.toMatrix());
-      ModelObject::update();
+      advanceFrame();
       if(m_state.triggerState == TriggerState::Deactivated)
       {
         m_state.collidable = false;
@@ -114,12 +114,12 @@ void Rat::update()
       if(!getWaterSurfaceHeight().has_value())
       {
         m_state.type = TR1ItemId::RatOnLand;
-        getSkeleton()->setAnim(
-          gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::RatOnLand)->animations[8]});
+        getSkeleton()->setAnim(gsl_lite::not_null{
+          &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::RatOnLand)->animations[8]});
         goal(5_as);
         m_state.current_anim_state = m_state.goal_anim_state;
         m_state.location.position.Y = m_state.floor;
-        applyTransform();
+        applyLogicTransform();
 
         loadObjectInfo(true);
       }
@@ -128,8 +128,8 @@ void Rat::update()
   else
   {
     BOOST_ASSERT(m_state.type == TR1ItemId::RatOnLand);
-    core::Angle turn = 0_deg;
-    core::Angle headRot = 0_deg;
+    auto turn = 0_deg;
+    auto headRot = 0_deg;
     if(alive())
     {
       const ai::EnemyLocation enemyLocation{*this};
@@ -184,20 +184,20 @@ void Rat::update()
     }
     else if(m_state.current_anim_state != 5_as)
     {
-      getSkeleton()->setAnim(
-        gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::RatOnLand)->animations[8]});
+      getSkeleton()->setAnim(gsl_lite::not_null{
+        &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::RatOnLand)->animations[8]});
       m_state.current_anim_state = 5_as;
     }
     rotateCreatureHead(headRot);
     if(const auto waterHeight = getWaterSurfaceHeight())
     {
       m_state.type = TR1ItemId::RatInWater;
-      getSkeleton()->setAnim(
-        gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::RatInWater)->animations[0]});
+      getSkeleton()->setAnim(gsl_lite::not_null{
+        &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::RatInWater)->animations[0]});
       goal(getSkeleton()->getAnim()->state_id);
       m_state.current_anim_state = getSkeleton()->getAnim()->state_id;
       m_state.location.position.Y = *waterHeight;
-      applyTransform();
+      applyLogicTransform();
 
       loadObjectInfo(true);
     }
@@ -205,4 +205,4 @@ void Rat::update()
     animateCreature(turn, 0_deg);
   }
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/rat.h b/src/engine/objects/rat.h
index 230fe59ad..ba80e6957 100644
--- a/src/engine/objects/rat.h
+++ b/src/engine/objects/rat.h
@@ -21,6 +21,6 @@ class Rat final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(Rat)
 
-  void update() override;
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/scionpiece.cpp b/src/engine/objects/scionpiece.cpp
index 67962fac3..d9d1fb438 100644
--- a/src/engine/objects/scionpiece.cpp
+++ b/src/engine/objects/scionpiece.cpp
@@ -9,6 +9,7 @@
 #include "engine/audioengine.h"
 #include "engine/cameracontroller.h"
 #include "engine/collisioninfo.h"
+#include "engine/engine.h"
 #include "engine/heightinfo.h"
 #include "engine/inventory.h"
 #include "engine/items_tr1.h"
@@ -35,7 +36,7 @@
 #include "serialization/serialization.h"
 #include "util/helpers.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::objects
@@ -61,16 +62,12 @@ void ScionPiece::collide(CollisionInfo& /*collisionInfo*/)
        && lara.getCurrentAnimState() == loader::file::LaraStateId::Stop)
     {
       lara.alignForInteraction({0_len, 640_len, -310_len}, m_state);
-      lara.getSkeleton()->setAnim(gsl::not_null{
+      lara.getSkeleton()->setAnim(gsl_lite::not_null{
         &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::AlternativeLara)->animations[0]});
       lara.setCurrentAnimState(loader::file::LaraStateId::PickUp);
       lara.setGoalAnimState(loader::file::LaraStateId::PickUp);
       lara.setHandStatus(HandStatus::Grabbing);
-      auto& cameraController = getWorld().getCameraController();
-      cameraController.setMode(CameraMode::Cinematic);
-      cameraController.m_cinematicFrame = 0_frame;
-      cameraController.m_cinematicPos = lara.m_state.location.position;
-      cameraController.m_cinematicRot = lara.m_state.rotation;
+      getWorld().getCameraController().startCinematic(lara.m_state.location.position, lara.m_state.rotation);
     }
   }
   else if(lara.getSkeleton()->getLocalFrame() == 44_frame)
@@ -102,12 +99,12 @@ void ScionPiece::deserialize(const serialization::Deserializer<world::World>& se
   };
 }
 
-void ScionPiece3::update()
+void ScionPiece3::updateLogic()
 {
   if(!m_state.isDead())
   {
     m_deadTime = 0_frame;
-    ModelObject::update();
+    advanceFrame();
     return;
   }
 
@@ -127,13 +124,14 @@ void ScionPiece3::update()
   {
     const auto pos = m_state.location.position
                      + core::TRVec{util::rand15s(512_len), util::rand15s(64_len) - 500_len, util::rand15s(512_len)};
-    const auto particle = gsl::make_shared<ExplosionParticle>(
+    const auto particle = gsl_lite::make_shared<ExplosionParticle>(
       Location{m_state.location.room, pos}, getWorld(), 0_spd, core::TRRotation{});
     setParent(particle, m_state.location.room->node);
     getWorld().getObjectManager().registerParticle(particle);
-    getWorld().getAudioEngine().playSoundEffect(TR1SoundEffect::ShrapnelExplosion, gsl::not_null{particle.get().get()});
+    getWorld().getAudioEngine().playSoundEffect(TR1SoundEffect::ShrapnelExplosion,
+                                                gsl_lite::not_null{particle.get().get()});
 
-    getWorld().getCameraController().setBounce(-200_len);
+    getWorld().getCameraController().setShake(-200_len);
   }
 
   m_deadTime += 1_frame;
@@ -157,19 +155,21 @@ void ScionPiece4::collide(CollisionInfo& /*info*/)
      || lara.getCurrentAnimState() != loader::file::LaraStateId::Stop || !limits.canInteract(m_state, lara.m_state))
     return;
 
-  static const core::GenericVec<core::Speed> alignSpeed{0_spd, 280_spd, -407_spd};
+  static constexpr core::GenericVec alignSpeed{0_spd, 280_spd, -407_spd};
 
   lara.alignTransform(alignSpeed, *this);
-  lara.getSkeleton()->setAnim(
-    gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::AlternativeLara)->animations[0]});
+  lara.getSkeleton()->setAnim(gsl_lite::not_null{
+    &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::AlternativeLara)->animations[0]});
   lara.setCurrentAnimState(loader::file::LaraStateId::PickUp);
   lara.setGoalAnimState(loader::file::LaraStateId::PickUp);
   lara.setHandStatus(HandStatus::Grabbing);
-  auto& cameraController = getWorld().getCameraController();
-  cameraController.m_cinematicFrame = 0_frame;
-  cameraController.setMode(CameraMode::Cinematic);
-  cameraController.m_cinematicPos = lara.m_state.location.position;
-  cameraController.m_cinematicRot = lara.m_state.rotation - core::TRRotation{0_deg, 90_deg, 0_deg};
+  getWorld().getCameraController().startCinematic(lara.m_state.location.position,
+                                                  lara.m_state.rotation - core::TRRotation{0_deg, 90_deg, 0_deg});
+}
+
+void ScionPiece4::updateLogic()
+{
+  advanceFrame();
 }
 
 void ScionHolder::collide(CollisionInfo& info)
@@ -185,4 +185,9 @@ void ScionHolder::collide(CollisionInfo& info)
 
   enemyPush(info, false, true);
 }
-} // namespace engine::objects
+
+void ScionHolder::updateLogic()
+{
+  advanceFrame();
+}
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/scionpiece.h b/src/engine/objects/scionpiece.h
index d95fd2234..1c1782468 100644
--- a/src/engine/objects/scionpiece.h
+++ b/src/engine/objects/scionpiece.h
@@ -41,7 +41,7 @@ class ScionPiece3 final : public ModelObject
 public:
   MODELOBJECT_DEFAULT_CONSTRUCTORS(ScionPiece3, true, false)
 
-  void update() override;
+  void updateLogic() override;
 
 private:
   core::Frame m_deadTime = 0_frame;
@@ -53,6 +53,8 @@ class ScionPiece4 final : public ModelObject
   MODELOBJECT_DEFAULT_CONSTRUCTORS(ScionPiece4, true, false)
 
   void collide(CollisionInfo& info) override;
+
+  void updateLogic() override;
 };
 
 class ScionHolder final : public ModelObject
@@ -61,5 +63,7 @@ class ScionHolder final : public ModelObject
   MODELOBJECT_DEFAULT_CONSTRUCTORS(ScionHolder, true, false)
 
   void collide(CollisionInfo& info) override;
+
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/segmentinterpolationmatrixstack.cpp b/src/engine/objects/segmentinterpolationmatrixstack.cpp
new file mode 100644
index 000000000..818d22d7e
--- /dev/null
+++ b/src/engine/objects/segmentinterpolationmatrixstack.cpp
@@ -0,0 +1,106 @@
+#include "segmentinterpolationmatrixstack.h"
+
+#include "util/helpers.h"
+
+namespace engine::objects
+{
+
+SegmentInterpolationMatrixStack::SegmentInterpolationMatrixStack(const float interKeyframeFactor)
+    : m_interKeyframeFactor{interKeyframeFactor}
+{
+}
+
+void SegmentInterpolationMatrixStack::push()
+{
+  m_stack1.push();
+  m_stack2.push();
+}
+
+void SegmentInterpolationMatrixStack::pop()
+{
+  m_stack1.pop();
+  m_stack2.pop();
+}
+
+glm::mat4 SegmentInterpolationMatrixStack::itop() const
+{
+  return util::lerp(m_stack1.top(), m_stack2.top(), m_interKeyframeFactor);
+}
+
+void SegmentInterpolationMatrixStack::rotate(const glm::mat4& m)
+{
+  m_stack1.top() *= m;
+  m_stack2.top() *= m;
+}
+
+void SegmentInterpolationMatrixStack::rotate(const core::TRRotation& r)
+{
+  rotate(r.toMatrix());
+}
+
+void SegmentInterpolationMatrixStack::rotate(const core::TRRotationXY& r)
+{
+  rotate(r.toMatrix());
+}
+
+void SegmentInterpolationMatrixStack::rotate(const uint8_t* packed1, const uint8_t* packed2)
+{
+  m_stack1.top() *= core::fromPackedAngles(packed1);
+  m_stack2.top() *= core::fromPackedAngles(packed2);
+}
+
+void SegmentInterpolationMatrixStack::resetRotation()
+{
+  m_stack1.resetRotation();
+  m_stack2.resetRotation();
+}
+
+void SegmentInterpolationMatrixStack::translate(const glm::vec3& v1, const glm::vec3& v2)
+{
+  m_stack1.top() = glm::translate(m_stack1.top(), v1);
+  m_stack2.top() = glm::translate(m_stack2.top(), v2);
+}
+
+void SegmentInterpolationMatrixStack::translate(const glm::vec3& v)
+{
+  translate(v, v);
+}
+
+void SegmentInterpolationMatrixStack::transform(const std::initializer_list<size_t>& indices,
+                                                const std::vector<world::SkeletalModelType::Bone>& bones,
+                                                const gsl_lite::span<const uint8_t>& angleData1,
+                                                const gsl_lite::span<const uint8_t>& angleData2)
+{
+  for(const auto idx : indices)
+    transform(idx, bones, angleData1, angleData2);
+}
+
+void SegmentInterpolationMatrixStack::transform(const size_t idx,
+                                                const std::vector<world::SkeletalModelType::Bone>& bones,
+                                                const gsl_lite::span<const uint8_t>& angleData1,
+                                                const gsl_lite::span<const uint8_t>& angleData2)
+{
+  BOOST_ASSERT(idx > 0);
+  translate(bones.at(idx).position);
+  rotate(&angleData1[sizeof(uint32_t) * idx], &angleData2[sizeof(uint32_t) * idx]);
+  apply(idx);
+}
+
+void SegmentInterpolationMatrixStack::apply(const size_t idx)
+{
+  m_stack1.apply(idx);
+  m_stack2.apply(idx);
+}
+
+std::vector<glm::mat4> SegmentInterpolationMatrixStack::getPoseMatrices() const
+{
+  const auto matrices1 = m_stack1.getPoseMatrices();
+  const auto matrices2 = m_stack2.getPoseMatrices();
+  gsl_Assert(matrices1.size() == matrices2.size());
+
+  std::vector<glm::mat4> result;
+  for(size_t i = 0; i < matrices1.size(); ++i)
+    result.emplace_back(util::lerp(matrices1[i], matrices2[i], m_interKeyframeFactor));
+  return result;
+}
+} // namespace engine::objects
diff --git a/src/engine/objects/segmentinterpolationmatrixstack.h b/src/engine/objects/segmentinterpolationmatrixstack.h
new file mode 100644
index 000000000..e4f46aaeb
--- /dev/null
+++ b/src/engine/objects/segmentinterpolationmatrixstack.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "core/angle.h"
+#include "core/vec.h"
+#include "matrixstack.h"
+
+#include <cstdint>
+#include <glm/ext/matrix_transform.hpp>
+#include <glm/mat4x4.hpp>
+
+namespace engine
+{
+}
+
+namespace engine::objects
+{
+class SegmentInterpolationMatrixStack
+{
+  MatrixStack m_stack1;
+  MatrixStack m_stack2;
+  float m_interKeyframeFactor;
+
+public:
+  explicit SegmentInterpolationMatrixStack(const float interKeyframeFactor);
+
+  void push();
+
+  void pop();
+
+  [[nodiscard]] glm::mat4 itop() const;
+
+  void rotate(const glm::mat4& m);
+
+  void rotate(const core::TRRotation& r);
+
+  void rotate(const core::TRRotationXY& r);
+
+  void rotate(const uint8_t* packed1, const uint8_t* packed2);
+
+  void resetRotation();
+
+  void translate(const glm::vec3& v1, const glm::vec3& v2);
+
+  void translate(const glm::vec3& v);
+
+  void transform(const std::initializer_list<size_t>& indices,
+                 const std::vector<world::SkeletalModelType::Bone>& bones,
+                 const gsl_lite::span<const uint8_t>& angleData1,
+                 const gsl_lite::span<const uint8_t>& angleData2);
+
+  void transform(const size_t idx,
+                 const std::vector<world::SkeletalModelType::Bone>& bones,
+                 const gsl_lite::span<const uint8_t>& angleData1,
+                 const gsl_lite::span<const uint8_t>& angleData2);
+
+  // NOLINTNEXTLINE(readability-make-member-function-const)
+  void apply(size_t idx);
+
+  std::vector<glm::mat4> getPoseMatrices() const;
+};
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/shatter.cpp b/src/engine/objects/shatter.cpp
index cc5362afe..3fa6c768b 100644
--- a/src/engine/objects/shatter.cpp
+++ b/src/engine/objects/shatter.cpp
@@ -18,6 +18,7 @@
 #include "engine/world/world.h"
 #include "modelobject.h"
 #include "objectstate.h"
+#include "render/material/materialmanager.h"
 #include "render/rendersettings.h"
 #include "render/scene/mesh.h" // IWYU pragma: keep
 #include "render/scene/node.h"
@@ -27,7 +28,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <gl/pixel.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -38,7 +39,7 @@ namespace engine::objects
 {
 bool shatterModel(ModelObject& object, const std::bitset<32>& meshMask, const core::Length& damageRadius)
 {
-  object.getSkeleton()->updatePose();
+  object.getSkeleton()->updateLogicPose(true);
   const bool isTorsoBoss = object.m_state.type == TR1ItemId::TorsoBoss;
 
   const auto modelSourceType
@@ -62,25 +63,25 @@ bool shatterModel(ModelObject& object, const std::bitset<32>& meshMask, const co
     object.getSkeleton()->rebuildMesh();
     world::RenderMeshDataCompositor compositor;
     compositor.append(*modelType->bones[i].mesh, gl::SRGBA8{0, 0, 0, 0});
-    auto particle = gsl::make_shared<MeshShrapnelParticle>(
+    auto particle = gsl_lite::make_shared<MeshShrapnelParticle>(
       Location{object.m_state.location.room, core::TRVec{object.getSkeleton()->getMeshPartTranslationWorld(i)}},
       object.getWorld(),
       compositor.toMesh(
-        *object.getWorld().getPresenter().getMaterialManager(),
+        object.getWorld().getEngine().getPresenter().getRenderSystem().getMaterialManager(),
         false,
         true,
-        [&settings = object.getWorld().getEngine().getEngineConfig()]()
+        [&settings = object.getWorld().getEngine().getEngineConfig()]
         {
           return settings->animSmoothing;
         },
-        [&settings = object.getWorld().getEngine().getEngineConfig()->renderSettings]()
+        [&settings = object.getWorld().getEngine().getEngineConfig()->renderSettings]
         {
           return !settings.lightingModeActive ? 0 : settings.lightingMode;
         },
         "shatter-part:" + std::to_string(i)),
       isTorsoBoss,
       damageRadius);
-    particle->negSpriteFrameId = gsl::narrow<int16_t>((modelType->meshBaseIndex + i).index);
+    particle->negSpriteFrameId = gsl_lite::narrow<int16_t>((modelType->meshBaseIndex + i).index);
     setParent(particle, object.m_state.location.room->node);
     object.getWorld().getObjectManager().registerParticle(std::move(particle));
 
@@ -95,4 +96,4 @@ bool shatterModel(ModelObject& object, const std::bitset<32>& meshMask, const co
 
   return true;
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/skateboardkid.cpp b/src/engine/objects/skateboardkid.cpp
index b38a628a2..c77a187c4 100644
--- a/src/engine/objects/skateboardkid.cpp
+++ b/src/engine/objects/skateboardkid.cpp
@@ -24,7 +24,7 @@
 #include "util/helpers.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <memory>
 #include <optional>
@@ -32,26 +32,26 @@
 
 namespace engine::objects
 {
-SkateboardKid::SkateboardKid(const gsl::not_null<world::World*>& world, const Location& location)
+SkateboardKid::SkateboardKid(const gsl_lite::not_null<world::World*>& world, const Location& location)
     : AIAgent{world, location}
     , m_skateboard{std::make_shared<SkeletalModelNode>(
         "skateboard",
         world,
-        gsl::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::Skateboard).get()},
+        gsl_lite::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::Skateboard).get()},
         true)}
 {
 }
 
 SkateboardKid::SkateboardKid(const std::string& name,
-                             const gsl::not_null<world::World*>& world,
-                             const gsl::not_null<const world::Room*>& room,
+                             const gsl_lite::not_null<world::World*>& world,
+                             const gsl_lite::not_null<const world::Room*>& room,
                              const loader::file::Item& item,
-                             const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : AIAgent{name, world, room, item, animatedModel}
     , m_skateboard{std::make_shared<SkeletalModelNode>(
         "skateboard",
         world,
-        gsl::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::Skateboard).get()},
+        gsl_lite::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::Skateboard).get()},
         true)}
 {
   m_state.current_anim_state = 2_as;
@@ -59,14 +59,14 @@ SkateboardKid::SkateboardKid(const std::string& name,
   m_lighting.bind(*m_skateboard, *world);
 }
 
-void SkateboardKid::update()
+void SkateboardKid::updateLogic()
 {
   // FIXME this is done somewhere else in the original engine, so this should be replaced with an "Expects" instead of
   //       initializing it here.
   initCreatureInfo();
 
-  core::Angle headRot = 0_deg;
-  core::Angle turn = 0_deg;
+  auto headRot = 0_deg;
+  auto turn = 0_deg;
   if(alive())
   {
     const ai::EnemyLocation enemyLocation{*this};
@@ -150,8 +150,8 @@ void SkateboardKid::update()
   }
   else if(m_state.current_anim_state != 5_as)
   {
-    getSkeleton()->setAnim(
-      gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::SkateboardKid)->animations[13]});
+    getSkeleton()->setAnim(gsl_lite::not_null{
+      &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::SkateboardKid)->animations[13]});
     m_state.current_anim_state = 5_as;
     getWorld().createPickup(TR1ItemId::UzisSprite, m_state.location.room, m_state.location.position);
   }
@@ -166,9 +166,9 @@ void SkateboardKid::update()
   const auto& skateboardAnim
     = getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::Skateboard)->animations[animIdx];
   const auto animFrame = skateboardAnim.firstFrame + getSkeleton()->getLocalFrame();
-  m_skateboard->setAnim(gsl::not_null{&skateboardAnim}, std::min(skateboardAnim.lastFrame, animFrame));
-  m_skateboard->updatePose();
-  setParent(gsl::not_null{m_skateboard}, getNode());
+  m_skateboard->setAnim(gsl_lite::not_null{&skateboardAnim}, std::min(skateboardAnim.lastFrame, animFrame));
+  m_skateboard->updateLogicPose(true);
+  setParent(gsl_lite::not_null{m_skateboard}, getNode());
 }
 
 void SkateboardKid::serialize(const serialization::Serializer<world::World>& ser) const
@@ -182,4 +182,4 @@ void SkateboardKid::deserialize(const serialization::Deserializer<world::World>&
   AIAgent::deserialize(ser);
   ser(S_NV("triedShoot", m_triedShoot), S_NV("skateboard", m_skateboard));
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/skateboardkid.h b/src/engine/objects/skateboardkid.h
index d2d25665d..c8d009129 100644
--- a/src/engine/objects/skateboardkid.h
+++ b/src/engine/objects/skateboardkid.h
@@ -3,7 +3,7 @@
 #include "aiagent.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -30,15 +30,15 @@ namespace engine::objects
 class SkateboardKid final : public AIAgent
 {
 public:
-  SkateboardKid(const gsl::not_null<world::World*>& world, const Location& location);
+  SkateboardKid(const gsl_lite::not_null<world::World*>& world, const Location& location);
 
   SkateboardKid(const std::string& name,
-                const gsl::not_null<world::World*>& world,
-                const gsl::not_null<const world::Room*>& room,
+                const gsl_lite::not_null<world::World*>& world,
+                const gsl_lite::not_null<const world::Room*>& room,
                 const loader::file::Item& item,
-                const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
@@ -47,4 +47,4 @@ class SkateboardKid final : public AIAgent
   bool m_triedShoot = false;
   std::shared_ptr<SkeletalModelNode> m_skateboard;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/slammingdoors.cpp b/src/engine/objects/slammingdoors.cpp
index ded04389a..87c2307fc 100644
--- a/src/engine/objects/slammingdoors.cpp
+++ b/src/engine/objects/slammingdoors.cpp
@@ -23,7 +23,7 @@
 
 namespace engine::objects
 {
-void SlammingDoors::update()
+void SlammingDoors::updateLogic()
 {
   if(!m_state.updateActivationTimeout())
   {
@@ -38,7 +38,7 @@ void SlammingDoors::update()
 
       const auto objectSpheres = getSkeleton()->getBoneCollisionSpheres();
 
-      const auto emitBlood = [&objectSpheres, this](const core::TRVec& bitePos, size_t boneId)
+      const auto emitBlood = [&objectSpheres, this](const core::TRVec& bitePos, const size_t boneId)
       {
         const auto position = core::TRVec{objectSpheres.at(boneId).relative(bitePos.toRenderSystem())};
         auto blood
@@ -53,7 +53,7 @@ void SlammingDoors::update()
       }
     }
   }
-  ModelObject::update();
+  advanceFrame();
 }
 
 void SlammingDoors::collide(CollisionInfo& collisionInfo)
diff --git a/src/engine/objects/slammingdoors.h b/src/engine/objects/slammingdoors.h
index e96246f6c..e387e3381 100644
--- a/src/engine/objects/slammingdoors.h
+++ b/src/engine/objects/slammingdoors.h
@@ -27,7 +27,7 @@ class SlammingDoors final : public ModelObject
 public:
   MODELOBJECT_DEFAULT_CONSTRUCTORS(SlammingDoors, true, false)
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& collisionInfo) override;
 };
diff --git a/src/engine/objects/slopedbridge.cpp b/src/engine/objects/slopedbridge.cpp
index f8e0b01e4..4ee32ed64 100644
--- a/src/engine/objects/slopedbridge.cpp
+++ b/src/engine/objects/slopedbridge.cpp
@@ -16,4 +16,14 @@ void SlopedBridge::deserialize(const serialization::Deserializer<world::World>&
   ModelObject::deserialize(ser);
   ser(S_NV("flatness", m_flatness));
 }
+
+void BridgeSlope1::updateLogic()
+{
+  advanceFrame();
+}
+
+void BridgeSlope2::updateLogic()
+{
+  advanceFrame();
+}
 } // namespace engine::objects
diff --git a/src/engine/objects/slopedbridge.h b/src/engine/objects/slopedbridge.h
index 9fff019a4..ba1ced313 100644
--- a/src/engine/objects/slopedbridge.h
+++ b/src/engine/objects/slopedbridge.h
@@ -10,7 +10,7 @@
 #include "qs/qs.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <optional>
 #include <string>
 
@@ -30,21 +30,20 @@ namespace engine::objects
 {
 class SlopedBridge : public ModelObject
 {
-private:
   int m_flatness;
 
 public:
-  SlopedBridge(const gsl::not_null<world::World*>& world, const Location& location)
+  SlopedBridge(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
       , m_flatness{0}
   {
   }
 
   SlopedBridge(const std::string& name,
-               const gsl::not_null<world::World*>& world,
-               const gsl::not_null<const world::Room*>& room,
+               const gsl_lite::not_null<world::World*>& world,
+               const gsl_lite::not_null<const world::Room*>& room,
                const loader::file::Item& item,
-               const gsl::not_null<const world::SkeletalModelType*>& animatedModel,
+               const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel,
                const int flatness)
       : ModelObject{name, world, room, item, false, animatedModel, false}
       , m_flatness{flatness}
@@ -81,7 +80,7 @@ class SlopedBridge : public ModelObject
 private:
   core::Length getBridgeSlopeHeight(const core::TRVec& pos) const
   {
-    auto axis = axisFromAngle(m_state.rotation.Y, 1_deg);
+    const auto axis = axisFromAngle(m_state.rotation.Y, 1_deg);
     gsl_Assert(axis.has_value());
 
     switch(*axis)
@@ -103,36 +102,40 @@ class SlopedBridge : public ModelObject
 class BridgeSlope1 final : public SlopedBridge
 {
 public:
-  BridgeSlope1(const gsl::not_null<world::World*>& world, const Location& location)
+  BridgeSlope1(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : SlopedBridge{world, location}
   {
   }
 
   BridgeSlope1(const std::string& name,
-               const gsl::not_null<world::World*>& world,
-               const gsl::not_null<const world::Room*>& room,
+               const gsl_lite::not_null<world::World*>& world,
+               const gsl_lite::not_null<const world::Room*>& room,
                const loader::file::Item& item,
-               const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+               const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : SlopedBridge{name, world, room, item, animatedModel, 4}
   {
   }
+
+  void updateLogic() override;
 };
 
 class BridgeSlope2 final : public SlopedBridge
 {
 public:
-  BridgeSlope2(const gsl::not_null<world::World*>& world, const Location& location)
+  BridgeSlope2(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : SlopedBridge{world, location}
   {
   }
 
   BridgeSlope2(const std::string& name,
-               const gsl::not_null<world::World*>& world,
-               const gsl::not_null<const world::Room*>& room,
+               const gsl_lite::not_null<world::World*>& world,
+               const gsl_lite::not_null<const world::Room*>& room,
                const loader::file::Item& item,
-               const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+               const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : SlopedBridge{name, world, room, item, animatedModel, 2}
   {
   }
+
+  void updateLogic() override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/spriteobject.cpp b/src/engine/objects/spriteobject.cpp
index b7ad4165e..de08685bd 100644
--- a/src/engine/objects/spriteobject.cpp
+++ b/src/engine/objects/spriteobject.cpp
@@ -28,7 +28,7 @@
 #include <glm/fwd.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/mat4x4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -42,12 +42,12 @@ class Mesh;
 namespace engine::objects
 {
 SpriteObject::SpriteObject(const std::string& name,
-                           const gsl::not_null<world::World*>& world,
-                           const gsl::not_null<const world::Room*>& room,
+                           const gsl_lite::not_null<world::World*>& world,
+                           const gsl_lite::not_null<const world::Room*>& room,
                            const loader::file::Item& item,
                            const bool hasUpdateFunction,
-                           const gsl::not_null<const world::Sprite*>& sprite,
-                           bool billboard)
+                           const gsl_lite::not_null<const world::Sprite*>& sprite,
+                           const bool billboard)
     : Object{world, room, item, hasUpdateFunction}
     , m_objectNode{std::make_shared<render::scene::Node>(name)}
     , m_displayNode{std::make_shared<render::scene::Node>(name + "-display")}
@@ -56,15 +56,15 @@ SpriteObject::SpriteObject(const std::string& name,
     , m_billboard{billboard}
 {
   createModel();
-  addChild(gsl::not_null{room->node}, m_objectNode);
+  addChild(gsl_lite::not_null{room->node}, m_objectNode);
   addChild(m_objectNode, m_displayNode);
-  applyTransform();
+  applyLogicTransform();
 }
 
 SpriteObject::SpriteObject(const std::string& name,
-                           const gsl::not_null<world::World*>& world,
+                           const gsl_lite::not_null<world::World*>& world,
                            const Location& location,
-                           bool billboard)
+                           const bool billboard)
     : Object{world, location}
     , m_objectNode{std::make_shared<render::scene::Node>(name)}
     , m_displayNode{std::make_shared<render::scene::Node>(name + "-display")}
@@ -102,8 +102,8 @@ void SpriteObject::createModel()
   m_displayNode->bind(
     "b_lights",
     [this,
-     emptyBuffer = std::make_shared<gl::ShaderStorageBuffer<engine::ShaderLight>>(
-       "lights-buffer-empty", gl::api::BufferUsage::StaticDraw, gsl::span<engine::ShaderLight>{})](
+     emptyBuffer = std::make_shared<gl::ShaderStorageBuffer<ShaderLight>>(
+       "lights-buffer-empty", gl::api::BufferUsage::StaticDraw, gsl_lite::span<ShaderLight>{})](
       const render::scene::Node*, const render::scene::Mesh& /*mesh*/, gl::ShaderStorageBlock& shaderStorageBlock)
     {
       if(getWorld().getEngine().getEngineConfig()->renderSettings.lightingModeActive)
@@ -139,10 +139,10 @@ void SpriteObject::deserialize(const serialization::Deserializer<world::World>&
   m_objectNode->setVisible(m_state.triggerState != TriggerState::Invisible);
 }
 
-void SpriteObject::replace(const TR1ItemId& itemId, const gsl::not_null<const world::Sprite*>& sprite)
+void SpriteObject::replace(const TR1ItemId& itemId, const gsl_lite::not_null<const world::Sprite*>& sprite)
 {
   m_sprite = sprite;
   m_state.type = itemId;
   createModel();
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/spriteobject.h b/src/engine/objects/spriteobject.h
index 2448856dc..e1001560e 100644
--- a/src/engine/objects/spriteobject.h
+++ b/src/engine/objects/spriteobject.h
@@ -8,7 +8,7 @@
 #include "serialization/serialization_fwd.h"
 
 #include <boost/throw_exception.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <stdexcept>
@@ -35,7 +35,6 @@ namespace engine::objects
 {
 class SpriteObject : public Object
 {
-private:
   gslu::nn_shared<render::scene::Node> m_objectNode;
   gslu::nn_shared<render::scene::Node> m_displayNode;
   const world::Sprite* m_sprite = nullptr;
@@ -46,17 +45,17 @@ class SpriteObject : public Object
 
 protected:
   SpriteObject(const std::string& name,
-               const gsl::not_null<world::World*>& world,
+               const gsl_lite::not_null<world::World*>& world,
                const Location& location,
                bool billboard);
 
 public:
   SpriteObject(const std::string& name,
-               const gsl::not_null<world::World*>& world,
-               const gsl::not_null<const world::Room*>& room,
+               const gsl_lite::not_null<world::World*>& world,
+               const gsl_lite::not_null<const world::Room*>& room,
                const loader::file::Item& item,
                bool hasUpdateFunction,
-               const gsl::not_null<const world::Sprite*>& sprite,
+               const gsl_lite::not_null<const world::Sprite*>& sprite,
                bool billboard);
 
   SpriteObject(const SpriteObject&) = delete;
@@ -79,7 +78,7 @@ class SpriteObject : public Object
     return m_objectNode;
   }
 
-  void update() override
+  void updateLogic() override
   {
   }
 
@@ -101,22 +100,21 @@ class SpriteObject : public Object
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
 
-  void replace(const TR1ItemId& itemId, const gsl::not_null<const world::Sprite*>& sprite);
+  void replace(const TR1ItemId& itemId, const gsl_lite::not_null<const world::Sprite*>& sprite);
 };
 
-#define SPRITEOBJECT_DEFAULT_CONSTRUCTORS(CLASS, HAS_UPDATE_FUNCTION, BILLBOARD)                      \
-  CLASS(const std::string& name, const gsl::not_null<world::World*>& world, const Location& location) \
-      : SpriteObject{name, world, location, BILLBOARD}                                                \
-  {                                                                                                   \
-  }                                                                                                   \
-                                                                                                      \
-  CLASS(const std::string& name,                                                                      \
-        const gsl::not_null<world::World*>& world,                                                    \
-        const gsl::not_null<const world::Room*>& room,                                                \
-        const loader::file::Item& item,                                                               \
-        const gsl::not_null<const world::Sprite*>& sprite)                                            \
-      : SpriteObject{name, world, room, item, HAS_UPDATE_FUNCTION, sprite, BILLBOARD}                 \
-  {                                                                                                   \
+#define SPRITEOBJECT_DEFAULT_CONSTRUCTORS(CLASS, HAS_UPDATE_FUNCTION, BILLBOARD)                           \
+  CLASS(const std::string& name, const gsl_lite::not_null<world::World*>& world, const Location& location) \
+      : SpriteObject{name, world, location, BILLBOARD}                                                     \
+  {                                                                                                        \
+  }                                                                                                        \
+                                                                                                           \
+  CLASS(const std::string& name,                                                                           \
+        const gsl_lite::not_null<world::World*>& world,                                                    \
+        const gsl_lite::not_null<const world::Room*>& room,                                                \
+        const loader::file::Item& item,                                                                    \
+        const gsl_lite::not_null<const world::Sprite*>& sprite)                                            \
+      : SpriteObject{name, world, room, item, HAS_UPDATE_FUNCTION, sprite, BILLBOARD}                      \
+  {                                                                                                        \
   }
-
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/stubobject.h b/src/engine/objects/stubobject.h
index 3ef07b66d..c755fa75c 100644
--- a/src/engine/objects/stubobject.h
+++ b/src/engine/objects/stubobject.h
@@ -8,5 +8,10 @@ class StubObject final : public ModelObject
 {
 public:
   MODELOBJECT_DEFAULT_CONSTRUCTORS(StubObject, false, false)
+
+  void updateLogic() override
+  {
+    advanceFrame();
+  }
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/suspendedshack.cpp b/src/engine/objects/suspendedshack.cpp
index 38fb5d29a..9019a2384 100644
--- a/src/engine/objects/suspendedshack.cpp
+++ b/src/engine/objects/suspendedshack.cpp
@@ -10,14 +10,14 @@
 
 #include <array>
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 // IWYU pragma: no_forward_declare serialization::Serializer
 
 namespace engine::objects
 {
-void SuspendedShack::update()
+void SuspendedShack::updateLogic()
 {
   if(m_state.activationState.isFullyActivated())
   {
@@ -43,7 +43,7 @@ void SuspendedShack::update()
     kill();
   }
 
-  ModelObject::update();
+  advanceFrame();
 }
 
 void SuspendedShack::collide(CollisionInfo& collisionInfo)
@@ -63,12 +63,12 @@ void SuspendedShack::deserialize(const serialization::Deserializer<world::World>
 }
 
 SuspendedShack::SuspendedShack(const std::string& name,
-                               const gsl::not_null<world::World*>& world,
-                               const gsl::not_null<const world::Room*>& room,
+                               const gsl_lite::not_null<world::World*>& world,
+                               const gsl_lite::not_null<const world::Room*>& room,
                                const loader::file::Item& item,
-                               const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                               const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
   getSkeleton()->getRenderState().setScissorTest(false);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/suspendedshack.h b/src/engine/objects/suspendedshack.h
index 1e5f98adc..56e954f6a 100644
--- a/src/engine/objects/suspendedshack.h
+++ b/src/engine/objects/suspendedshack.h
@@ -3,7 +3,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -29,20 +29,20 @@ namespace engine::objects
 class SuspendedShack final : public ModelObject
 {
 public:
-  SuspendedShack(const gsl::not_null<world::World*>& world, const Location& location)
+  SuspendedShack(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   SuspendedShack(const std::string& name,
-                 const gsl::not_null<world::World*>& world,
-                 const gsl::not_null<const world::Room*>& room,
+                 const gsl_lite::not_null<world::World*>& world,
+                 const gsl_lite::not_null<const world::Room*>& room,
                  const loader::file::Item& item,
-                 const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                 const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
   void collide(CollisionInfo& collisionInfo) override;
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/swingingblade.cpp b/src/engine/objects/swingingblade.cpp
index b97bdae00..38d7a34fd 100644
--- a/src/engine/objects/swingingblade.cpp
+++ b/src/engine/objects/swingingblade.cpp
@@ -19,13 +19,13 @@
 
 #include <bitset>
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
 namespace engine::objects
 {
-void SwingingBlade::update()
+void SwingingBlade::updateLogic()
 {
   if(!m_state.updateActivationTimeout())
   {
@@ -50,10 +50,11 @@ void SwingingBlade::update()
       getWorld().getObjectManager().getLara().m_state.location.position.X + util::rand15s(128_len),
       getWorld().getObjectManager().getLara().m_state.location.position.Y - util::rand15(745_len),
       getWorld().getObjectManager().getLara().m_state.location.position.Z + util::rand15s(128_len)};
-    auto fx = createBloodSplat(getWorld(),
-                               Location{m_state.location.room, splatPos},
-                               getWorld().getObjectManager().getLara().m_state.speed,
-                               getWorld().getObjectManager().getLara().m_state.rotation.Y + util::rand15s(+22_deg));
+    const auto fx
+      = createBloodSplat(getWorld(),
+                         Location{m_state.location.room, splatPos},
+                         getWorld().getObjectManager().getLara().m_state.speed,
+                         getWorld().getObjectManager().getLara().m_state.rotation.Y + util::rand15s(+22_deg));
     getWorld().getObjectManager().registerParticle(fx);
   }
 
@@ -62,7 +63,7 @@ void SwingingBlade::update()
   m_state.floor
     = HeightInfo::fromFloor(sector, m_state.location.position, getWorld().getObjectManager().getObjects()).y;
 
-  ModelObject::update();
+  advanceFrame();
 }
 
 void SwingingBlade::collide(CollisionInfo& collisionInfo)
@@ -82,12 +83,12 @@ void SwingingBlade::deserialize(const serialization::Deserializer<world::World>&
 }
 
 SwingingBlade::SwingingBlade(const std::string& name,
-                             const gsl::not_null<world::World*>& world,
-                             const gsl::not_null<const world::Room*>& room,
+                             const gsl_lite::not_null<world::World*>& world,
+                             const gsl_lite::not_null<const world::Room*>& room,
                              const loader::file::Item& item,
-                             const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, true}
 {
   getSkeleton()->getRenderState().setScissorTest(false);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/swingingblade.h b/src/engine/objects/swingingblade.h
index 13b345899..d3e2985db 100644
--- a/src/engine/objects/swingingblade.h
+++ b/src/engine/objects/swingingblade.h
@@ -3,7 +3,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -29,21 +29,21 @@ namespace engine::objects
 class SwingingBlade final : public ModelObject
 {
 public:
-  SwingingBlade(const gsl::not_null<world::World*>& world, const Location& location)
+  SwingingBlade(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   SwingingBlade(const std::string& name,
-                const gsl::not_null<world::World*>& world,
-                const gsl::not_null<const world::Room*>& room,
+                const gsl_lite::not_null<world::World*>& world,
+                const gsl_lite::not_null<const world::Room*>& room,
                 const loader::file::Item& item,
-                const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& collisionInfo) override;
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/switch.cpp b/src/engine/objects/switch.cpp
index a11c6f390..b60af8904 100644
--- a/src/engine/objects/switch.cpp
+++ b/src/engine/objects/switch.cpp
@@ -4,6 +4,7 @@
 #include "core/boundingbox.h"
 #include "core/id.h"
 #include "core/units.h"
+#include "engine/engine.h"
 #include "engine/objectmanager.h"
 #include "engine/presenter.h"
 #include "engine/world/world.h"
@@ -49,7 +50,7 @@ void Switch::collide(CollisionInfo& /*collisionInfo*/)
     do
     {
       getWorld().getObjectManager().getLara().setGoalAnimState(loader::file::LaraStateId::SwitchDown);
-      getWorld().getObjectManager().getLara().advanceFrame();
+      getWorld().getObjectManager().getLara().advanceLaraFrame();
     } while(getWorld().getObjectManager().getLara().getCurrentAnimState() != loader::file::LaraStateId::SwitchDown);
     getWorld().getObjectManager().getLara().setGoalAnimState(loader::file::LaraStateId::Stop);
     m_state.goal_anim_state = 0_as;
@@ -63,7 +64,7 @@ void Switch::collide(CollisionInfo& /*collisionInfo*/)
     do
     {
       getWorld().getObjectManager().getLara().setGoalAnimState(loader::file::LaraStateId::SwitchUp);
-      getWorld().getObjectManager().getLara().advanceFrame();
+      getWorld().getObjectManager().getLara().advanceLaraFrame();
     } while(getWorld().getObjectManager().getLara().getCurrentAnimState() != loader::file::LaraStateId::SwitchUp);
     getWorld().getObjectManager().getLara().setGoalAnimState(loader::file::LaraStateId::Stop);
     m_state.goal_anim_state = 1_as;
@@ -73,6 +74,6 @@ void Switch::collide(CollisionInfo& /*collisionInfo*/)
   m_state.triggerState = TriggerState::Active;
 
   activate();
-  ModelObject::update();
+  advanceFrame();
 }
 } // namespace engine::objects
diff --git a/src/engine/objects/switch.h b/src/engine/objects/switch.h
index d5fb7ed63..27d351c4c 100644
--- a/src/engine/objects/switch.h
+++ b/src/engine/objects/switch.h
@@ -31,9 +31,9 @@ class Switch : public ModelObject
 public:
   MODELOBJECT_DEFAULT_CONSTRUCTORS(Switch, true, false)
 
-  void collide(CollisionInfo& collisionInfo) override;
+  void collide(CollisionInfo& /*collisionInfo*/) override;
 
-  void update() final
+  void updateLogic() final
   {
     m_state.activationState.fullyActivate();
     if(!m_state.updateActivationTimeout())
@@ -43,7 +43,7 @@ class Switch : public ModelObject
       m_state.timer = 0_frame;
     }
 
-    ModelObject::update();
+    advanceFrame();
   }
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/swordofdamocles.cpp b/src/engine/objects/swordofdamocles.cpp
index f4c83653c..4e1ceca55 100644
--- a/src/engine/objects/swordofdamocles.cpp
+++ b/src/engine/objects/swordofdamocles.cpp
@@ -21,13 +21,13 @@
 #include "util/helpers.h"
 
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
 namespace engine::objects
 {
-void SwordOfDamocles::update()
+void SwordOfDamocles::updateLogic()
 {
   if(m_state.falling)
   {
@@ -55,8 +55,8 @@ void SwordOfDamocles::update()
   else if(m_state.location.position.Y != m_state.floor)
   {
     m_state.rotation.Y += m_rotateSpeed * 1_frame;
-    const auto d = getWorld().getObjectManager().getLara().m_state.location.position - m_state.location.position;
-    if(abs(d.X) <= 1536_len && abs(d.Z) <= 1536_len && d.Y > 0_len && d.Y < 3_sectors)
+    if(const auto d = getWorld().getObjectManager().getLara().m_state.location.position - m_state.location.position;
+       abs(d.X) <= 1536_len && abs(d.Z) <= 1536_len && d.Y > 0_len && d.Y < 3_sectors)
     {
       m_dropSpeedX = d.X / 32_frame;
       m_dropSpeedZ = d.Z / 32_frame;
@@ -64,7 +64,7 @@ void SwordOfDamocles::update()
     }
   }
 
-  applyTransform();
+  applyLogicTransform();
 }
 
 void SwordOfDamocles::collide(CollisionInfo& collisionInfo)
@@ -81,10 +81,10 @@ void SwordOfDamocles::collide(CollisionInfo& collisionInfo)
   getWorld().hitLara(100_hp);
   const auto tmp = getWorld().getObjectManager().getLara().m_state.location.position
                    + core::TRVec{util::rand15s(128_len), -util::rand15(745_len), util::rand15s(128_len)};
-  auto fx = createBloodSplat(getWorld(),
-                             Location{m_state.location.room, tmp},
-                             getWorld().getObjectManager().getLara().m_state.speed,
-                             util::rand15s(22.5_deg) + m_state.rotation.Y);
+  const auto fx = createBloodSplat(getWorld(),
+                                   Location{m_state.location.room, tmp},
+                                   getWorld().getObjectManager().getLara().m_state.speed,
+                                   util::rand15s(22.5_deg) + m_state.rotation.Y);
   getWorld().getObjectManager().registerParticle(fx);
 }
 
@@ -101,16 +101,16 @@ void SwordOfDamocles::deserialize(const serialization::Deserializer<world::World
   getSkeleton()->getRenderState().setScissorTest(false);
 }
 
-SwordOfDamocles::SwordOfDamocles(const gsl::not_null<world::World*>& world, const Location& location)
+SwordOfDamocles::SwordOfDamocles(const gsl_lite::not_null<world::World*>& world, const Location& location)
     : ModelObject{world, location}
 {
 }
 
 SwordOfDamocles::SwordOfDamocles(const std::string& name,
-                                 const gsl::not_null<world::World*>& world,
-                                 const gsl::not_null<const world::Room*>& room,
+                                 const gsl_lite::not_null<world::World*>& world,
+                                 const gsl_lite::not_null<const world::Room*>& room,
                                  const loader::file::Item& item,
-                                 const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                                 const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, true}
 {
   m_state.rotation.Y += util::rand15s(180_deg) + util::rand15s(180_deg);
@@ -118,4 +118,4 @@ SwordOfDamocles::SwordOfDamocles(const std::string& name,
   m_rotateSpeed = util::rand15s(2048_au / 1_frame);
   getSkeleton()->getRenderState().setScissorTest(false);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/swordofdamocles.h b/src/engine/objects/swordofdamocles.h
index 34585313d..17e5098df 100644
--- a/src/engine/objects/swordofdamocles.h
+++ b/src/engine/objects/swordofdamocles.h
@@ -4,7 +4,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -30,15 +30,15 @@ namespace engine::objects
 class SwordOfDamocles final : public ModelObject
 {
 public:
-  SwordOfDamocles(const gsl::not_null<world::World*>& world, const Location& location);
+  SwordOfDamocles(const gsl_lite::not_null<world::World*>& world, const Location& location);
 
   SwordOfDamocles(const std::string& name,
-                  const gsl::not_null<world::World*>& world,
-                  const gsl::not_null<const world::Room*>& room,
+                  const gsl_lite::not_null<world::World*>& world,
+                  const gsl_lite::not_null<const world::Room*>& room,
                   const loader::file::Item& item,
-                  const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                  const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
   void collide(CollisionInfo& collisionInfo) override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
@@ -49,4 +49,4 @@ class SwordOfDamocles final : public ModelObject
   core::Speed m_dropSpeedX{0_spd};
   core::Speed m_dropSpeedZ{0_spd};
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/tallblock.cpp b/src/engine/objects/tallblock.cpp
index 8703f9a59..f2275d615 100644
--- a/src/engine/objects/tallblock.cpp
+++ b/src/engine/objects/tallblock.cpp
@@ -13,7 +13,7 @@
 #include "serialization/serialization.h" // IWYU pragma: keep
 
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -21,14 +21,14 @@
 
 namespace engine::objects
 {
-void TallBlock::update()
+void TallBlock::updateLogic()
 {
   if(m_state.updateActivationTimeout())
   {
     if(m_state.current_anim_state == 0_as)
     {
       world::patchHeightsForBlock(*this, 2_sectors);
-      getSkeleton()->resetInterpolation();
+      getSkeleton()->resetSmoothing();
       m_state.goal_anim_state = 1_as;
     }
   }
@@ -37,12 +37,12 @@ void TallBlock::update()
     if(m_state.current_anim_state == 1_as)
     {
       world::patchHeightsForBlock(*this, 2_sectors);
-      getSkeleton()->resetInterpolation();
+      getSkeleton()->resetSmoothing();
       m_state.goal_anim_state = 0_as;
     }
   }
 
-  ModelObject::update();
+  advanceFrame();
   m_state.location.updateRoom();
   setCurrentRoom(m_state.location.room);
 
@@ -53,7 +53,7 @@ void TallBlock::update()
 
   m_state.triggerState = TriggerState::Active;
   world::patchHeightsForBlock(*this, -2_sectors);
-  getSkeleton()->resetInterpolation();
+  getSkeleton()->resetSmoothing();
   auto pos = m_state.location.position;
   pos.X = snappedSector(pos.X) + 1_sectors / 2;
   pos.Z = snappedSector(pos.Z) + 1_sectors / 2;
@@ -72,19 +72,19 @@ void TallBlock::deserialize(const serialization::Deserializer<world::World>& ser
   world::patchHeightsForBlock(*this, 2_sectors);
   ModelObject::deserialize(ser);
   world::patchHeightsForBlock(*this, -2_sectors);
-  getSkeleton()->resetInterpolation();
+  getSkeleton()->resetSmoothing();
   getSkeleton()->getRenderState().setScissorTest(false);
 }
 
 TallBlock::TallBlock(const std::string& name,
-                     const gsl::not_null<world::World*>& world,
-                     const gsl::not_null<const world::Room*>& room,
+                     const gsl_lite::not_null<world::World*>& world,
+                     const gsl_lite::not_null<const world::Room*>& room,
                      const loader::file::Item& item,
-                     const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                     const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
   world::patchHeightsForBlock(*this, -2_sectors);
   getSkeleton()->getRenderState().setScissorTest(false);
-  getSkeleton()->resetInterpolation();
+  getSkeleton()->resetSmoothing();
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/tallblock.h b/src/engine/objects/tallblock.h
index 3d61488b1..241a745ff 100644
--- a/src/engine/objects/tallblock.h
+++ b/src/engine/objects/tallblock.h
@@ -3,7 +3,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -28,20 +28,20 @@ namespace engine::objects
 class TallBlock final : public ModelObject
 {
 public:
-  TallBlock(const gsl::not_null<world::World*>& world, const Location& location)
+  TallBlock(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   TallBlock(const std::string& name,
-            const gsl::not_null<world::World*>& world,
-            const gsl::not_null<const world::Room*>& room,
+            const gsl_lite::not_null<world::World*>& world,
+            const gsl_lite::not_null<const world::Room*>& room,
             const loader::file::Item& item,
-            const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+            const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/teethspikes.cpp b/src/engine/objects/teethspikes.cpp
index b7fa624c1..5736f51c5 100644
--- a/src/engine/objects/teethspikes.cpp
+++ b/src/engine/objects/teethspikes.cpp
@@ -19,7 +19,9 @@
 
 #include <memory>
 
-void engine::objects::TeethSpikes::collide(CollisionInfo& collisionInfo)
+namespace engine::objects
+{
+void TeethSpikes::collide(CollisionInfo& collisionInfo)
 {
   if(!getWorld().getObjectManager().getLara().isDead()
      && isNear(getWorld().getObjectManager().getLara(), collisionInfo.collisionRadius)
@@ -57,7 +59,7 @@ void engine::objects::TeethSpikes::collide(CollisionInfo& collisionInfo)
     if(getWorld().getObjectManager().getLara().isDead())
     {
       getWorld().getObjectManager().getLara().getSkeleton()->setAnim(
-        gsl::not_null{&getWorld().getWorldGeometry().getAnimation(loader::file::AnimationId::SPIKED)});
+        gsl_lite::not_null{&getWorld().getWorldGeometry().getAnimation(loader::file::AnimationId::SPIKED)});
       getWorld().getObjectManager().getLara().setCurrentAnimState(loader::file::LaraStateId::Death);
       getWorld().getObjectManager().getLara().setGoalAnimState(loader::file::LaraStateId::Death);
       getWorld().getObjectManager().getLara().m_state.falling = false;
@@ -65,3 +67,9 @@ void engine::objects::TeethSpikes::collide(CollisionInfo& collisionInfo)
     }
   }
 }
+
+void TeethSpikes::updateLogic()
+{
+  advanceFrame();
+}
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/teethspikes.h b/src/engine/objects/teethspikes.h
index 7f08f5c78..4b3a6cd5a 100644
--- a/src/engine/objects/teethspikes.h
+++ b/src/engine/objects/teethspikes.h
@@ -28,5 +28,7 @@ class TeethSpikes final : public ModelObject
   MODELOBJECT_DEFAULT_CONSTRUCTORS(TeethSpikes, true, false)
 
   void collide(CollisionInfo& collisionInfo) override;
+
+  void updateLogic() override;
 };
 } // namespace engine::objects
diff --git a/src/engine/objects/thorhammer.cpp b/src/engine/objects/thorhammer.cpp
index 22115e587..367a995f6 100644
--- a/src/engine/objects/thorhammer.cpp
+++ b/src/engine/objects/thorhammer.cpp
@@ -29,7 +29,7 @@
 
 #include <boost/throw_exception.hpp>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <memory>
 #include <stdexcept>
@@ -46,10 +46,10 @@ constexpr auto Settle = 3_as;
 } // namespace
 
 ThorHammerHandle::ThorHammerHandle(const std::string& name,
-                                   const gsl::not_null<world::World*>& world,
-                                   const gsl::not_null<const world::Room*>& room,
+                                   const gsl_lite::not_null<world::World*>& world,
+                                   const gsl_lite::not_null<const world::Room*>& room,
                                    loader::file::Item item,
-                                   const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                                   const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
   item.type = TR1ItemId::ThorHammerBlock;
@@ -58,20 +58,20 @@ ThorHammerHandle::ThorHammerHandle(const std::string& name,
     world,
     room,
     item,
-    gsl::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::ThorHammerBlock).get()});
-  getWorld().getObjectManager().registerObject(gsl::not_null{m_block});
+    gsl_lite::not_null{world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::ThorHammerBlock).get()});
+  getWorld().getObjectManager().registerObject(gsl_lite::not_null{m_block});
   m_block->activate();
   m_block->m_state.triggerState = TriggerState::Active;
 
   getSkeleton()->getRenderState().setScissorTest(false);
 }
 
-ThorHammerHandle::ThorHammerHandle(const gsl::not_null<world::World*>& world, const Location& location)
+ThorHammerHandle::ThorHammerHandle(const gsl_lite::not_null<world::World*>& world, const Location& location)
     : ModelObject{world, location}
 {
 }
 
-void ThorHammerHandle::update()
+void ThorHammerHandle::updateLogic()
 {
   switch(m_state.current_anim_state.get())
   {
@@ -103,8 +103,8 @@ void ThorHammerHandle::update()
 
       if(auto& lara = getWorld().getObjectManager().getLara(); !lara.isDead())
       {
-        core::TRVec& laraPos = lara.m_state.location.position;
-        if(pos.X - 520_len < laraPos.X && pos.X + 520_len > laraPos.X && pos.Z - 520_len < laraPos.Z
+        if(core::TRVec& laraPos = lara.m_state.location.position;
+           pos.X - 520_len < laraPos.X && pos.X + 520_len > laraPos.X && pos.Z - 520_len < laraPos.Z
            && pos.Z + 520_len > laraPos.Z)
         {
           lara.m_state.health = core::DeadHealth;
@@ -158,14 +158,14 @@ void ThorHammerHandle::update()
   default:
     break;
   }
-  ModelObject::update();
+  advanceFrame();
 
   // sync anim
   const auto animIdx
     = std::distance(&getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::ThorHammerHandle)->animations[0],
                     getSkeleton()->getAnim());
   m_block->getSkeleton()->replaceAnim(
-    gsl::not_null{
+    gsl_lite::not_null{
       &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::ThorHammerBlock)->animations[animIdx]},
     getSkeleton()->getLocalFrame());
   m_block->m_state.current_anim_state = m_state.current_anim_state;
@@ -220,13 +220,18 @@ void ThorHammerBlock::deserialize(const serialization::Deserializer<world::World
   getSkeleton()->getRenderState().setScissorTest(false);
 }
 
+void ThorHammerBlock::updateLogic()
+{
+  advanceFrame();
+}
+
 ThorHammerBlock::ThorHammerBlock(const std::string& name,
-                                 const gsl::not_null<world::World*>& world,
-                                 const gsl::not_null<const world::Room*>& room,
+                                 const gsl_lite::not_null<world::World*>& world,
+                                 const gsl_lite::not_null<const world::Room*>& room,
                                  const loader::file::Item& item,
-                                 const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                                 const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
   getSkeleton()->getRenderState().setScissorTest(false);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/thorhammer.h b/src/engine/objects/thorhammer.h
index 28d98dfe3..9540a1f8e 100644
--- a/src/engine/objects/thorhammer.h
+++ b/src/engine/objects/thorhammer.h
@@ -3,7 +3,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
@@ -30,35 +30,37 @@ namespace engine::objects
 class ThorHammerBlock final : public ModelObject
 {
 public:
-  ThorHammerBlock(const gsl::not_null<world::World*>& world, const Location& location)
+  ThorHammerBlock(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   ThorHammerBlock(const std::string& name,
-                  const gsl::not_null<world::World*>& world,
-                  const gsl::not_null<const world::Room*>& room,
+                  const gsl_lite::not_null<world::World*>& world,
+                  const gsl_lite::not_null<const world::Room*>& room,
                   const loader::file::Item& item,
-                  const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                  const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
   void collide(CollisionInfo& info) override;
 
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
+
+  void updateLogic() override;
 };
 
 class ThorHammerHandle final : public ModelObject
 {
 public:
-  ThorHammerHandle(const gsl::not_null<world::World*>& world, const Location& location);
+  ThorHammerHandle(const gsl_lite::not_null<world::World*>& world, const Location& location);
 
   ThorHammerHandle(const std::string& name,
-                   const gsl::not_null<world::World*>& world,
-                   const gsl::not_null<const world::Room*>& room,
+                   const gsl_lite::not_null<world::World*>& world,
+                   const gsl_lite::not_null<const world::Room*>& room,
                    loader::file::Item item,
-                   const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+                   const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void collide(CollisionInfo& info) override;
 
@@ -68,4 +70,4 @@ class ThorHammerHandle final : public ModelObject
 private:
   std::shared_ptr<ThorHammerBlock> m_block;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/trapdoordown.cpp b/src/engine/objects/trapdoordown.cpp
index e8092f697..057476b7a 100644
--- a/src/engine/objects/trapdoordown.cpp
+++ b/src/engine/objects/trapdoordown.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/assert.hpp>
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 #include <string>
@@ -22,10 +22,10 @@
 namespace engine::objects
 {
 TrapDoorDown::TrapDoorDown(const std::string& name,
-                           const gsl::not_null<world::World*>& world,
-                           const gsl::not_null<const world::Room*>& room,
+                           const gsl_lite::not_null<world::World*>& world,
+                           const gsl_lite::not_null<const world::Room*>& room,
                            const loader::file::Item& item,
-                           const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                           const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
   getSkeleton()->getRenderState().setScissorTest(false);
@@ -46,7 +46,7 @@ void TrapDoorDown::deserialize(const serialization::Deserializer<world::World>&
   getSkeleton()->getRenderState().setPolygonOffset(-1, -1);
 }
 
-void TrapDoorDown::update()
+void TrapDoorDown::updateLogic()
 {
   if(m_state.updateActivationTimeout())
   {
@@ -59,7 +59,7 @@ void TrapDoorDown::update()
       m_state.goal_anim_state = 0_as;
   }
 
-  ModelObject::update();
+  advanceFrame();
 }
 
 void TrapDoorDown::patchFloor(const core::TRVec& pos, core::Length& y)
@@ -86,7 +86,7 @@ bool TrapDoorDown::possiblyOnTrapdoor(const core::TRVec& pos) const
   const auto trapdoorSectorZ = sectorOf(m_state.location.position.Z);
   const auto posSectorX = sectorOf(pos.X);
   const auto posSectorZ = sectorOf(pos.Z);
-  auto trapdoorAxis = axisFromAngle(m_state.rotation.Y, 1_au);
+  const auto trapdoorAxis = axisFromAngle(m_state.rotation.Y, 1_au);
   BOOST_ASSERT(trapdoorAxis.has_value());
 
   if(*trapdoorAxis == core::Axis::PosZ && trapdoorSectorX == posSectorX
@@ -104,4 +104,4 @@ bool TrapDoorDown::possiblyOnTrapdoor(const core::TRVec& pos) const
 
   return false;
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/trapdoordown.h b/src/engine/objects/trapdoordown.h
index 1d196a1b7..615106ef9 100644
--- a/src/engine/objects/trapdoordown.h
+++ b/src/engine/objects/trapdoordown.h
@@ -5,7 +5,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -30,18 +30,18 @@ namespace engine::objects
 class TrapDoorDown final : public ModelObject
 {
 public:
-  TrapDoorDown(const gsl::not_null<world::World*>& world, const Location& location)
+  TrapDoorDown(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   TrapDoorDown(const std::string& name,
-               const gsl::not_null<world::World*>& world,
-               const gsl::not_null<const world::Room*>& room,
+               const gsl_lite::not_null<world::World*>& world,
+               const gsl_lite::not_null<const world::Room*>& room,
                const loader::file::Item& item,
-               const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+               const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void patchFloor(const core::TRVec& pos, core::Length& y) override;
 
@@ -53,4 +53,4 @@ class TrapDoorDown final : public ModelObject
 private:
   bool possiblyOnTrapdoor(const core::TRVec& pos) const;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/trapdoorup.cpp b/src/engine/objects/trapdoorup.cpp
index 9332f025c..96b5d5402 100644
--- a/src/engine/objects/trapdoorup.cpp
+++ b/src/engine/objects/trapdoorup.cpp
@@ -14,14 +14,14 @@
 
 #include <boost/assert.hpp>
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 #include <string>
 
 namespace engine::objects
 {
-void TrapDoorUp::update()
+void TrapDoorUp::updateLogic()
 {
   if(m_state.updateActivationTimeout())
   {
@@ -32,16 +32,16 @@ void TrapDoorUp::update()
     m_state.goal_anim_state = 0_as;
   }
 
-  ModelObject::update();
+  advanceFrame();
   m_state.location.updateRoom();
   setCurrentRoom(m_state.location.room);
 }
 
 TrapDoorUp::TrapDoorUp(const std::string& name,
-                       const gsl::not_null<world::World*>& world,
-                       const gsl::not_null<const world::Room*>& room,
+                       const gsl_lite::not_null<world::World*>& world,
+                       const gsl_lite::not_null<const world::Room*>& room,
                        const loader::file::Item& item,
-                       const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                       const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : ModelObject{name, world, room, item, true, animatedModel, false}
 {
   getSkeleton()->getRenderState().setScissorTest(false);
@@ -84,7 +84,7 @@ bool TrapDoorUp::possiblyOnTrapdoor(const core::TRVec& pos) const
   const auto trapdoorSectorZ = sectorOf(m_state.location.position.Z);
   const auto posSectorX = sectorOf(pos.X);
   const auto posSectorZ = sectorOf(pos.Z);
-  auto trapdoorAxis = axisFromAngle(m_state.rotation.Y, 1_au);
+  const auto trapdoorAxis = axisFromAngle(m_state.rotation.Y, 1_au);
   BOOST_ASSERT(trapdoorAxis.has_value());
 
   if(*trapdoorAxis == core::Axis::PosZ && trapdoorSectorX == posSectorX
@@ -102,4 +102,4 @@ bool TrapDoorUp::possiblyOnTrapdoor(const core::TRVec& pos) const
 
   return false;
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/trapdoorup.h b/src/engine/objects/trapdoorup.h
index f001811b4..eb570e357 100644
--- a/src/engine/objects/trapdoorup.h
+++ b/src/engine/objects/trapdoorup.h
@@ -5,7 +5,7 @@
 #include "modelobject.h"
 #include "serialization/serialization_fwd.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -30,18 +30,18 @@ namespace engine::objects
 class TrapDoorUp final : public ModelObject
 {
 public:
-  TrapDoorUp(const gsl::not_null<world::World*>& world, const Location& location)
+  TrapDoorUp(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : ModelObject{world, location}
   {
   }
 
   TrapDoorUp(const std::string& name,
-             const gsl::not_null<world::World*>& world,
-             const gsl::not_null<const world::Room*>& room,
+             const gsl_lite::not_null<world::World*>& world,
+             const gsl_lite::not_null<const world::Room*>& room,
              const loader::file::Item& item,
-             const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+             const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 
   void patchFloor(const core::TRVec& pos, core::Length& y) override;
 
@@ -53,4 +53,4 @@ class TrapDoorUp final : public ModelObject
 private:
   bool possiblyOnTrapdoor(const core::TRVec& pos) const;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/trex.cpp b/src/engine/objects/trex.cpp
index dd7eabb2f..faf6acadd 100644
--- a/src/engine/objects/trex.cpp
+++ b/src/engine/objects/trex.cpp
@@ -23,12 +23,12 @@
 #include "serialization/serialization.h"
 #include "util/helpers.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace engine::objects
 {
-void TRex::update()
+void TRex::updateLogic()
 {
   static constexpr auto Think = 1_as;
   static constexpr auto Attack = 2_as;
@@ -39,7 +39,7 @@ void TRex::update()
 
   core::Angle turn;
 
-  core::Angle creatureHead = 0_deg;
+  auto creatureHead = 0_deg;
   if(alive())
   {
     const ai::EnemyLocation enemyLocation{*this};
@@ -109,7 +109,7 @@ void TRex::update()
         lara.m_state.rotation.X = 0_deg;
         lara.m_state.rotation.Y = m_state.rotation.Y;
         lara.m_state.rotation.Z = 0_deg;
-        lara.getSkeleton()->setAnim(gsl::not_null{
+        lara.getSkeleton()->setAnim(gsl_lite::not_null{
           &getWorld().getWorldGeometry().findAnimatedModelForType(TR1ItemId::AlternativeLara)->animations[1]});
         lara.setCurrentAnimState(loader::file::LaraStateId::BoulderDeath);
         lara.setGoalAnimState(loader::file::LaraStateId::BoulderDeath);
@@ -159,4 +159,4 @@ void TRex::deserialize(const serialization::Deserializer<world::World>& ser)
   AIAgent::deserialize(ser);
   ser(S_NV("wantAttack", m_wantAttack));
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/trex.h b/src/engine/objects/trex.h
index c042ab52e..1e4c32688 100644
--- a/src/engine/objects/trex.h
+++ b/src/engine/objects/trex.h
@@ -22,7 +22,7 @@ class TRex final : public AIAgent
 public:
   AIAGENT_DEFAULT_CONSTRUCTORS(TRex)
 
-  void update() override;
+  void updateLogic() override;
   void serialize(const serialization::Serializer<world::World>& ser) const override;
   void deserialize(const serialization::Deserializer<world::World>& ser) override;
 
diff --git a/src/engine/objects/underwaterswitch.cpp b/src/engine/objects/underwaterswitch.cpp
index cfff69dde..8c287cbc5 100644
--- a/src/engine/objects/underwaterswitch.cpp
+++ b/src/engine/objects/underwaterswitch.cpp
@@ -4,6 +4,7 @@
 #include "core/genericvec.h"
 #include "core/id.h"
 #include "core/units.h"
+#include "engine/engine.h"
 #include "engine/objectmanager.h"
 #include "engine/presenter.h"
 #include "engine/world/world.h"
@@ -44,7 +45,7 @@ void UnderwaterSwitch::collide(CollisionInfo& /*collisionInfo*/)
   if(m_state.current_anim_state != 0_as && m_state.current_anim_state != 1_as)
     return;
 
-  static const core::GenericVec<core::Speed> alignSpeed{0_spd, 0_spd, 108_spd};
+  static constexpr core::GenericVec alignSpeed{0_spd, 0_spd, 108_spd};
   if(!lara.alignTransform(alignSpeed, *this))
     return;
 
@@ -53,7 +54,7 @@ void UnderwaterSwitch::collide(CollisionInfo& /*collisionInfo*/)
   do
   {
     lara.setGoalAnimState(loader::file::LaraStateId::SwitchDown);
-    lara.advanceFrame();
+    lara.advanceLaraFrame();
   } while(lara.getCurrentAnimState() != loader::file::LaraStateId::SwitchDown);
   lara.setGoalAnimState(loader::file::LaraStateId::UnderwaterStop);
   lara.setHandStatus(HandStatus::Grabbing);
@@ -69,6 +70,6 @@ void UnderwaterSwitch::collide(CollisionInfo& /*collisionInfo*/)
   }
 
   activate();
-  ModelObject::update(); // NOLINT(bugprone-parent-virtual-call)
+  advanceFrame(); // NOLINT(bugprone-parent-virtual-call)
 }
 } // namespace engine::objects
diff --git a/src/engine/objects/underwaterswitch.h b/src/engine/objects/underwaterswitch.h
index f543ae366..e36cd616d 100644
--- a/src/engine/objects/underwaterswitch.h
+++ b/src/engine/objects/underwaterswitch.h
@@ -2,7 +2,7 @@
 
 #include "switch.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -28,20 +28,20 @@ namespace engine::objects
 class UnderwaterSwitch final : public Switch
 {
 public:
-  UnderwaterSwitch(const gsl::not_null<world::World*>& world, const Location& location)
+  UnderwaterSwitch(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : Switch{world, location}
   {
   }
 
   UnderwaterSwitch(const std::string& name,
-                   const gsl::not_null<world::World*>& world,
-                   const gsl::not_null<const world::Room*>& room,
+                   const gsl_lite::not_null<world::World*>& world,
+                   const gsl_lite::not_null<const world::Room*>& room,
                    const loader::file::Item& item,
-                   const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                   const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : Switch{name, world, room, item, animatedModel}
   {
   }
 
   void collide(CollisionInfo& collisionInfo) override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/waterfallmist.cpp b/src/engine/objects/waterfallmist.cpp
index b8ac9dcf1..8e42837a0 100644
--- a/src/engine/objects/waterfallmist.cpp
+++ b/src/engine/objects/waterfallmist.cpp
@@ -13,21 +13,21 @@
 #include "qs/quantity.h"
 #include "render/scene/node.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::objects
 {
-void WaterfallMist::update()
+void WaterfallMist::updateLogic()
 {
   if(!m_state.activationState.isFullyActivated())
     return;
 
-  const auto d = m_state.location.position - getWorld().getObjectManager().getLara().m_state.location.position;
-  if(abs(d.X) > 20_sectors || abs(d.Y) > 20_sectors || abs(d.Z) > 20_sectors)
+  if(const auto d = m_state.location.position - getWorld().getObjectManager().getLara().m_state.location.position;
+     abs(d.X) > 20_sectors || abs(d.Y) > 20_sectors || abs(d.Z) > 20_sectors)
     return;
 
-  auto particle = gsl::make_shared<SplashParticle>(m_state.location, getWorld(), true);
+  const auto particle = gsl_lite::make_shared<SplashParticle>(m_state.location, getWorld(), true);
   setParent(particle, m_state.location.room->node);
   getWorld().getObjectManager().registerParticle(particle);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/waterfallmist.h b/src/engine/objects/waterfallmist.h
index e6923f17a..8ee26e105 100644
--- a/src/engine/objects/waterfallmist.h
+++ b/src/engine/objects/waterfallmist.h
@@ -2,7 +2,7 @@
 
 #include "modelobject.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -27,20 +27,20 @@ namespace engine::objects
 class WaterfallMist final : public NullRenderModelObject
 {
 public:
-  WaterfallMist(const gsl::not_null<world::World*>& world, const Location& location)
+  WaterfallMist(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : NullRenderModelObject{world, location}
   {
   }
 
   WaterfallMist(const std::string& name,
-                const gsl::not_null<world::World*>& world,
-                const gsl::not_null<const world::Room*>& room,
+                const gsl_lite::not_null<world::World*>& world,
+                const gsl_lite::not_null<const world::Room*>& room,
                 const loader::file::Item& item,
-                const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+                const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
       : NullRenderModelObject{name, world, room, item, true, animatedModel}
   {
   }
 
-  void update() override;
+  void updateLogic() override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/weapon.cpp b/src/engine/objects/weapon.cpp
index 035ddf138..7195cd72a 100644
--- a/src/engine/objects/weapon.cpp
+++ b/src/engine/objects/weapon.cpp
@@ -11,7 +11,7 @@
 
 namespace engine::objects
 {
-const Weapon& Weapon::get(WeaponType weaponType)
+const Weapon& Weapon::get(const WeaponType weaponType)
 {
   static const std::unordered_map<WeaponType, Weapon> weapons{{WeaponType::None, Weapon{}},
                                                               {WeaponType::Pistols,
@@ -66,7 +66,7 @@ const Weapon& Weapon::get(WeaponType weaponType)
                                                                       9_frame,
                                                                       3_frame,
                                                                       TR1SoundEffect::LaraShootShotgun}}};
-  auto it = weapons.find(weaponType);
+  const auto it = weapons.find(weaponType);
   if(it == weapons.end())
     BOOST_THROW_EXCEPTION(std::domain_error("invalid weapon type"));
   return it->second; // cppcheck-suppress derefInvalidIteratorRedundantCheck
diff --git a/src/engine/objects/wolf.cpp b/src/engine/objects/wolf.cpp
index 79680c754..0ee0b69ff 100644
--- a/src/engine/objects/wolf.cpp
+++ b/src/engine/objects/wolf.cpp
@@ -16,14 +16,14 @@
 #include "util/helpers.h"
 
 #include <boost/assert.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 #include <utility>
 
 namespace engine::objects
 {
-void Wolf::update()
+void Wolf::updateLogic()
 {
   activateAi();
 
@@ -38,9 +38,9 @@ void Wolf::update()
   static constexpr auto Dying = 11_as;
   static constexpr auto Biting = 12_as;
 
-  core::Angle pitch = 0_deg;
-  core::Angle roll = 0_deg;
-  core::Angle turn = 0_deg;
+  auto pitch = 0_deg;
+  auto roll = 0_deg;
+  auto turn = 0_deg;
   if(alive())
   {
     const ai::EnemyLocation enemyLocation{*this};
@@ -178,7 +178,7 @@ void Wolf::update()
     const auto r = util::rand15(3);
     getSkeleton()->setAnimation(
       m_state.current_anim_state,
-      gsl::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(m_state.type)->animations[20 + r]},
+      gsl_lite::not_null{&getWorld().getWorldGeometry().findAnimatedModelForType(m_state.type)->animations[20 + r]},
       0_frame);
     BOOST_ASSERT(m_state.current_anim_state == Dying);
   }
@@ -189,13 +189,13 @@ void Wolf::update()
 }
 
 Wolf::Wolf(const std::string& name,
-           const gsl::not_null<world::World*>& world,
-           const gsl::not_null<const world::Room*>& room,
+           const gsl_lite::not_null<world::World*>& world,
+           const gsl_lite::not_null<const world::Room*>& room,
            const loader::file::Item& item,
-           const gsl::not_null<const world::SkeletalModelType*>& animatedModel)
+           const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel)
     : AIAgent{name, world, room, item, animatedModel}
 {
-  getSkeleton()->setAnim(gsl::not_null{getSkeleton()->getAnim()}, 96_frame);
-  getSkeleton()->updatePose();
+  getSkeleton()->setAnim(gsl_lite::not_null{getSkeleton()->getAnim()}, 96_frame);
+  getSkeleton()->updateLogicPose(true);
 }
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/objects/wolf.h b/src/engine/objects/wolf.h
index 8fec1ab3d..d7050f39e 100644
--- a/src/engine/objects/wolf.h
+++ b/src/engine/objects/wolf.h
@@ -2,7 +2,7 @@
 
 #include "aiagent.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 namespace engine
@@ -27,17 +27,17 @@ namespace engine::objects
 class Wolf final : public AIAgent
 {
 public:
-  Wolf(const gsl::not_null<world::World*>& world, const Location& location)
+  Wolf(const gsl_lite::not_null<world::World*>& world, const Location& location)
       : AIAgent{world, location}
   {
   }
 
   Wolf(const std::string& name,
-       const gsl::not_null<world::World*>& world,
-       const gsl::not_null<const world::Room*>& room,
+       const gsl_lite::not_null<world::World*>& world,
+       const gsl_lite::not_null<const world::Room*>& room,
        const loader::file::Item& item,
-       const gsl::not_null<const world::SkeletalModelType*>& animatedModel);
+       const gsl_lite::not_null<const world::SkeletalModelType*>& animatedModel);
 
-  void update() override;
+  void updateLogic() override;
 };
-} // namespace engine::objects
+} // namespace engine::objects
\ No newline at end of file
diff --git a/src/engine/particle.cpp b/src/engine/particle.cpp
index c30bb5c33..f611ee15b 100644
--- a/src/engine/particle.cpp
+++ b/src/engine/particle.cpp
@@ -44,7 +44,7 @@
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <tuple>
@@ -53,7 +53,7 @@
 
 namespace engine
 {
-void Particle::initRenderables(world::World& world, render::material::SpriteMaterialMode mode)
+void Particle::initRenderables(world::World& world, const render::material::SpriteMaterialMode mode)
 {
   if(const auto& modelType = world.getWorldGeometry().findAnimatedModelForType(object_number))
   {
@@ -62,14 +62,14 @@ void Particle::initRenderables(world::World& world, render::material::SpriteMate
       world::RenderMeshDataCompositor compositor;
       compositor.append(*bone.mesh, gl::SRGBA8{0, 0, 0, 0});
       m_meshes.emplace_back(compositor.toMesh(
-                              *world.getPresenter().getMaterialManager(),
+                              world.getEngine().getPresenter().getRenderSystem().getMaterialManager(),
                               false,
                               false,
                               [&world]() -> bool
                               {
                                 return world.getEngine().getEngineConfig()->animSmoothing;
                               },
-                              [&world]()
+                              [&world]
                               {
                                 const auto& settings = world.getEngine().getEngineConfig()->renderSettings;
                                 return !settings.lightingModeActive ? 0 : settings.lightingMode;
@@ -117,13 +117,13 @@ glm::vec3 Particle::getPosition() const
 
 Particle::Particle(const std::string& id,
                    const core::TypeId& objectNumber,
-                   const gsl::not_null<const world::Room*>& room,
+                   const gsl_lite::not_null<const world::Room*>& room,
                    world::World& world,
-                   render::material::SpriteMaterialMode mode,
-                   bool withoutParent,
+                   const render::material::SpriteMaterialMode mode,
+                   const bool withoutParent,
                    const std::shared_ptr<render::scene::Mesh>& renderable)
     : Node{id}
-    , Emitter{gsl::not_null{world.getPresenter().getSoundEngine().get()}}
+    , Emitter{gsl_lite::not_null{world.getEngine().getPresenter().getSoundEngine().get().get()}}
     , location{room}
     , object_number{objectNumber}
     , m_withoutParent{withoutParent}
@@ -134,7 +134,7 @@ Particle::Particle(const std::string& id,
   }
   else
   {
-    m_meshes.emplace_back(gsl::not_null{renderable}, nullptr);
+    m_meshes.emplace_back(gsl_lite::not_null{renderable}, nullptr);
     setRenderable(std::get<0>(m_meshes.front()));
     m_lighting.bind(*this, world);
   }
@@ -144,11 +144,11 @@ Particle::Particle(const std::string& id,
                    const core::TypeId& objectNumber,
                    Location location,
                    world::World& world,
-                   render::material::SpriteMaterialMode mode,
-                   bool withoutParent,
+                   const render::material::SpriteMaterialMode mode,
+                   const bool withoutParent,
                    const std::shared_ptr<render::scene::Mesh>& renderable)
     : Node{id}
-    , Emitter{gsl::not_null{world.getPresenter().getSoundEngine().get()}}
+    , Emitter{gsl_lite::not_null{world.getEngine().getPresenter().getSoundEngine().get().get()}}
     , location{std::move(location)}
     , object_number{objectNumber}
     , m_withoutParent{withoutParent}
@@ -165,16 +165,37 @@ Particle::Particle(const std::string& id,
   }
 }
 
-void Particle::applyTransform()
+void Particle::applyLogicTransform()
 {
   location.updateRoom();
+
+  predictedPosition = location.position;
+  predictedAngle = angle;
+
+  if(speed != 0_spd)
+  {
+    predictedPosition += util::pitch(speed * 1_frame, angle.Y);
+  }
+  if(fall_speed != 0_spd)
+  {
+    predictedPosition.Y += fall_speed * 1_frame;
+  }
+
+  interpolateTransform(0);
+}
+
+void Particle::interpolateTransform(const float interTickFactor)
+{
   m_lighting.update(m_shade.value_or(core::Shade{core::Shade::type{-1}}), *location.room);
 
-  auto l = location.position.toRenderSystem();
+  const auto pos = core::lerp(location.position, predictedPosition, interTickFactor);
+  const auto rot = core::lerp(angle, predictedAngle, interTickFactor);
+
+  auto l = pos.toRenderSystem();
   if(!m_withoutParent)
     l -= location.room->position.toRenderSystem();
 
-  auto transform = glm::scale(angle.toMatrix(), glm::vec3{scale});
+  auto transform = glm::scale(rot.toMatrix(), glm::vec3{scale});
   transform[3] = glm::vec4{l, 1.0f};
   setLocalMatrix(transform);
 }
@@ -210,31 +231,31 @@ BloodSplatterParticle::BloodSplatterParticle(const Location& location,
   angle.Y = angle_;
 }
 
-bool BloodSplatterParticle::update(world::World& world)
+bool BloodSplatterParticle::updateLogic(world::World& world)
 {
   location.position += util::pitch(speed * 1_frame, angle.Y);
   ++timePerSpriteFrame;
   if(timePerSpriteFrame != 4)
   {
-    applyTransform();
+    applyLogicTransform();
     return true;
   }
 
   timePerSpriteFrame = 0;
   nextFrame();
-  if(gsl::narrow<size_t>(-negSpriteFrameId)
+  if(gsl_lite::narrow<size_t>(-negSpriteFrameId)
      >= world.getWorldGeometry().findSpriteSequenceForType(object_number)->sprites.size())
     return false;
 
-  applyTransform();
+  applyLogicTransform();
   return true;
 }
 
-bool SplashParticle::update(world::World& world)
+bool SplashParticle::updateLogic(world::World& world)
 {
   nextFrame();
 
-  if(gsl::narrow<size_t>(-negSpriteFrameId)
+  if(gsl_lite::narrow<size_t>(-negSpriteFrameId)
      >= world.getWorldGeometry().findSpriteSequenceForType(object_number)->sprites.size())
   {
     return false;
@@ -242,7 +263,7 @@ bool SplashParticle::update(world::World& world)
 
   location.position += util::pitch(speed * 1_frame, angle.Y);
 
-  applyTransform();
+  applyLogicTransform();
   return true;
 }
 
@@ -262,7 +283,10 @@ SplashParticle::SplashParticle(const Location& location, world::World& world, co
   getRenderState().setScissorTest(false);
 }
 
-BubbleParticle::BubbleParticle(const Location& location, world::World& world, bool onlyInWater, bool instanced)
+BubbleParticle::BubbleParticle(const Location& location,
+                               world::World& world,
+                               const bool onlyInWater,
+                               const bool instanced)
     : Particle{"bubble",
                TR1ItemId::Bubbles,
                location,
@@ -279,7 +303,7 @@ BubbleParticle::BubbleParticle(const Location& location, world::World& world, bo
     nextFrame();
 }
 
-bool BubbleParticle::update(world::World& world)
+bool BubbleParticle::updateLogic(world::World& world)
 {
   angle.X += 13_deg;
   angle.Y += 9_deg;
@@ -296,11 +320,11 @@ bool BubbleParticle::update(world::World& world)
     return false;
   }
 
-  applyTransform();
+  applyLogicTransform();
   return true;
 }
 
-FlameParticle::FlameParticle(const Location& location, world::World& world, bool randomize)
+FlameParticle::FlameParticle(const Location& location, world::World& world, const bool randomize)
     : Particle{"flame", TR1ItemId::Flame, location, world, render::material::SpriteMaterialMode::YAxisBound}
 {
   timePerSpriteFrame = 0;
@@ -310,21 +334,21 @@ FlameParticle::FlameParticle(const Location& location, world::World& world, bool
   if(randomize)
   {
     timePerSpriteFrame
-      = -util::rand15(gsl::narrow_cast<int16_t>(world.getObjectManager().getLara().getSkeleton()->getBoneCount()))
+      = -util::rand15(gsl_lite::narrow_cast<int16_t>(world.getObjectManager().getLara().getSkeleton()->getBoneCount()))
         - int16_t{1};
     for(auto n = util::rand15(getLength()); n != 0; --n)
       nextFrame();
   }
 }
 
-bool FlameParticle::update(world::World& world)
+bool FlameParticle::updateLogic(world::World& world)
 {
   nextFrame();
   const auto& spriteSequence = world.getWorldGeometry().findSpriteSequenceForType(object_number);
   if(spriteSequence == nullptr)
     return false;
 
-  if(gsl::narrow<size_t>(-negSpriteFrameId) >= spriteSequence->sprites.size())
+  if(gsl_lite::narrow<size_t>(-negSpriteFrameId) >= spriteSequence->sprites.size())
     negSpriteFrameId = 0;
 
   const auto& lara = world.getObjectManager().getLara();
@@ -335,7 +359,7 @@ bool FlameParticle::update(world::World& world)
     if(timePerSpriteFrame != 0)
     {
       --timePerSpriteFrame;
-      applyTransform();
+      applyLogicTransform();
       return true;
     }
 
@@ -353,17 +377,16 @@ bool FlameParticle::update(world::World& world)
         // only attach a new flame to lara every 100 frames
         timePerSpriteFrame = 100;
 
-        const auto alreadyAttachedToLara
-          = std::any_of(world.getObjectManager().getParticles().begin(),
-                        world.getObjectManager().getParticles().end(),
-                        [](const gslu::nn_shared<Particle>& particle)
-                        {
-                          return particle->object_number == TR1ItemId::Flame && particle->timePerSpriteFrame == -1;
-                        });
+        const auto alreadyAttachedToLara = std::ranges::any_of(world.getObjectManager().getParticles(),
+                                                               [](const gslu::nn_shared<Particle>& particle)
+                                                               {
+                                                                 return particle->object_number == TR1ItemId::Flame
+                                                                        && particle->timePerSpriteFrame == -1;
+                                                               });
 
         if(!alreadyAttachedToLara)
         {
-          const auto particle = gsl::make_shared<FlameParticle>(location, world);
+          const auto particle = gsl_lite::make_shared<FlameParticle>(location, world);
           particle->timePerSpriteFrame = -1;
           if(!withoutParent())
             setParent(particle, location.room->node);
@@ -377,7 +400,7 @@ bool FlameParticle::update(world::World& world)
     // this flame is attached to lara
     const auto itemSpheres = lara.getSkeleton()->getBoneCollisionSpheres();
     location.position = core::TRVec{
-      itemSpheres.at(gsl::narrow_cast<int>(-timePerSpriteFrame) - 1)
+      itemSpheres.at(gsl_lite::narrow_cast<int>(-timePerSpriteFrame) - 1)
         .relative(core::TRVec{0_len, timePerSpriteFrame == -1 ? -100_len : 0_len, 0_len}.toRenderSystem())};
 
     if(const auto waterHeight = world::getWaterSurfaceHeight(location);
@@ -394,11 +417,11 @@ bool FlameParticle::update(world::World& world)
     }
   }
 
-  applyTransform();
+  applyLogicTransform();
   return true;
 }
 
-bool MeshShrapnelParticle::update(world::World& world)
+bool MeshShrapnelParticle::updateLogic(world::World& world)
 {
   angle.X += 5_deg;
   angle.Z += 10_deg;
@@ -407,8 +430,8 @@ bool MeshShrapnelParticle::update(world::World& world)
   location.position += util::pitch(speed * 1_frame, angle.Y, fall_speed * 1_frame);
 
   const auto sector = location.updateRoom();
-  const auto ceiling = HeightInfo::fromCeiling(sector, location.position, world.getObjectManager().getObjects()).y;
-  if(ceiling > location.position.Y)
+  if(const auto ceiling = HeightInfo::fromCeiling(sector, location.position, world.getObjectManager().getObjects()).y;
+     ceiling > location.position.Y)
   {
     location.position.Y = ceiling;
     fall_speed = -fall_speed;
@@ -440,12 +463,12 @@ bool MeshShrapnelParticle::update(world::World& world)
 
   if(!withoutParent())
     setParent(this, location.room->node);
-  applyTransform();
+  applyLogicTransform();
 
   if(!explode)
     return true;
 
-  const auto particle = gsl::make_shared<ExplosionParticle>(location, world, fall_speed, angle);
+  const auto particle = gsl_lite::make_shared<ExplosionParticle>(location, world, fall_speed, angle);
   if(!withoutParent())
     setParent(particle, location.room->node);
   world.getObjectManager().registerParticle(particle);
@@ -493,7 +516,7 @@ void MutantAmmoParticle::aimLaraChest(world::World& world)
   angle.Y = util::rand15s(256_au) + angleFromAtan(d.X, d.Z);
 }
 
-bool MutantBulletParticle::update(world::World& world)
+bool MutantBulletParticle::updateLogic(world::World& world)
 {
   location.position += util::yawPitch(speed * 1_frame, angle);
   const auto sector = location.updateRoom();
@@ -503,7 +526,7 @@ bool MutantBulletParticle::update(world::World& world)
      || HeightInfo::fromCeiling(sector, location.position, world.getObjectManager().getObjects()).y
           >= location.position.Y)
   {
-    auto particle = gsl::make_shared<RicochetParticle>(location, world);
+    const auto particle = gsl_lite::make_shared<RicochetParticle>(location, world);
     particle->timePerSpriteFrame = 6;
     if(!withoutParent())
       setParent(particle, location.room->node);
@@ -515,7 +538,7 @@ bool MutantBulletParticle::update(world::World& world)
   {
     world.hitLara(30_hp);
     const auto& laraState = world.getObjectManager().getLara().m_state;
-    auto particle = gsl::make_shared<BloodSplatterParticle>(location, speed, angle.Y, world);
+    const auto particle = gsl_lite::make_shared<BloodSplatterParticle>(location, speed, angle.Y, world);
     if(!withoutParent())
       setParent(particle, location.room->node);
     world.getObjectManager().registerParticle(particle);
@@ -527,11 +550,11 @@ bool MutantBulletParticle::update(world::World& world)
     return false;
   }
 
-  applyTransform();
+  applyLogicTransform();
   return true;
 }
 
-bool MutantGrenadeParticle::update(world::World& world)
+bool MutantGrenadeParticle::updateLogic(world::World& world)
 {
   location.position += util::yawPitch(speed * 1_frame, angle);
   const auto sector = location.updateRoom();
@@ -541,15 +564,14 @@ bool MutantGrenadeParticle::update(world::World& world)
      || HeightInfo::fromCeiling(sector, location.position, world.getObjectManager().getObjects()).y
           >= location.position.Y)
   {
-    auto particle = gsl::make_shared<ExplosionParticle>(location, world, fall_speed, angle);
+    const auto particle = gsl_lite::make_shared<ExplosionParticle>(location, world, fall_speed, angle);
     if(!withoutParent())
       setParent(particle, location.room->node);
     world.getObjectManager().registerParticle(particle);
     world.getAudioEngine().playSoundEffect(TR1SoundEffect::ShrapnelExplosion, particle.get().get());
 
     const auto dd = location.position - world.getObjectManager().getLara().m_state.location.position;
-    const auto d = util::square(dd.X) + util::square(dd.Y) + util::square(dd.Z);
-    if(d < util::square(1024_len))
+    if(const auto d = util::square(dd.X) + util::square(dd.Y) + util::square(dd.Z); d < util::square(1024_len))
     {
       world.hitLara(100_hp * (util::square(1_sectors) - d) / util::square(1_sectors));
     }
@@ -559,7 +581,7 @@ bool MutantGrenadeParticle::update(world::World& world)
   else if(world.getObjectManager().getLara().isNearInexact(location.position, 200_len))
   {
     world.hitLara(100_hp);
-    auto particle = gsl::make_shared<ExplosionParticle>(location, world, fall_speed, angle);
+    const auto particle = gsl_lite::make_shared<ExplosionParticle>(location, world, fall_speed, angle);
     if(!withoutParent())
       setParent(particle, location.room->node);
     world.getObjectManager().registerParticle(particle);
@@ -579,7 +601,7 @@ bool MutantGrenadeParticle::update(world::World& world)
     return false;
   }
 
-  applyTransform();
+  applyLogicTransform();
   return true;
 }
 
@@ -592,7 +614,7 @@ LavaParticle::LavaParticle(const Location& location, world::World& world)
   negSpriteFrameId = util::rand15(int16_t{-4});
 }
 
-bool LavaParticle::update(world::World& world)
+bool LavaParticle::updateLogic(world::World& world)
 {
   fall_speed += core::Gravity * 1_frame;
   location.position += util::pitch(speed * 1_frame, angle.Y, fall_speed * 1_frame);
@@ -613,7 +635,7 @@ bool LavaParticle::update(world::World& world)
     return false;
   }
 
-  applyTransform();
+  applyLogicTransform();
   return true;
 }
 
@@ -622,9 +644,9 @@ SparkleParticle::SparkleParticle(const Location& location, world::World& world)
 {
 }
 
-bool SparkleParticle::update(world::World&)
+bool SparkleParticle::updateLogic(world::World&)
 {
-  applyTransform();
+  applyLogicTransform();
 
   ++timePerSpriteFrame;
   if(timePerSpriteFrame != 1)
@@ -632,7 +654,7 @@ bool SparkleParticle::update(world::World&)
 
   --negSpriteFrameId;
   timePerSpriteFrame = 0;
-  return gsl::narrow<size_t>(-negSpriteFrameId) < getLength();
+  return gsl_lite::narrow<size_t>(-negSpriteFrameId) < getLength();
 }
 
 MuzzleFlashParticle::MuzzleFlashParticle(const Location& location, world::World& world, const core::Angle& yAngle)
@@ -644,14 +666,14 @@ MuzzleFlashParticle::MuzzleFlashParticle(const Location& location, world::World&
   setShade(core::Shade{core::Shade::type{4096}});
 }
 
-bool MuzzleFlashParticle::update(world::World&)
+bool MuzzleFlashParticle::updateLogic(world::World&)
 {
   --timePerSpriteFrame;
   if(timePerSpriteFrame == 0)
     return false;
 
   angle.Z = util::rand15s(+180_deg);
-  applyTransform();
+  applyLogicTransform();
   return true;
 }
 
@@ -665,7 +687,7 @@ ExplosionParticle::ExplosionParticle(const Location& location,
   this->angle = angle;
 }
 
-bool ExplosionParticle::update(world::World&)
+bool ExplosionParticle::updateLogic(world::World&)
 {
   ++timePerSpriteFrame;
   if(timePerSpriteFrame == 2)
@@ -678,7 +700,7 @@ bool ExplosionParticle::update(world::World&)
     }
   }
 
-  applyTransform();
+  applyLogicTransform();
   return true;
 }
 
@@ -688,9 +710,9 @@ SmokeParticle::SmokeParticle(const Location& location, world::World& world, cons
   angle = rotation;
 }
 
-bool SmokeParticle::update(world::World&)
+bool SmokeParticle::updateLogic(world::World&)
 {
-  applyTransform();
+  applyLogicTransform();
 
   ++timePerSpriteFrame;
   if(timePerSpriteFrame < 3)
@@ -698,7 +720,7 @@ bool SmokeParticle::update(world::World&)
 
   timePerSpriteFrame = 0;
   nextFrame();
-  return gsl::narrow<size_t>(-negSpriteFrameId) < getLength();
+  return gsl_lite::narrow<size_t>(-negSpriteFrameId) < getLength();
 }
 
 RicochetParticle::RicochetParticle(const Location& location, world::World& world)
@@ -711,9 +733,9 @@ RicochetParticle::RicochetParticle(const Location& location, world::World& world
     nextFrame();
 }
 
-bool RicochetParticle::update(world::World&)
+bool RicochetParticle::updateLogic(world::World&)
 {
-  applyTransform();
+  applyLogicTransform();
 
   --timePerSpriteFrame;
   return timePerSpriteFrame != 0;
@@ -724,7 +746,7 @@ gslu::nn_shared<Particle> createMuzzleFlash(world::World& world,
                                             const core::Speed& /*speed*/,
                                             const core::Angle& angle)
 {
-  auto particle = gsl::make_shared<MuzzleFlashParticle>(location, world, angle);
+  auto particle = gsl_lite::make_shared<MuzzleFlashParticle>(location, world, angle);
   setParent(particle, location.room->node);
   return particle;
 }
@@ -734,7 +756,7 @@ gslu::nn_shared<Particle> createMutantBullet(world::World& world,
                                              const core::Speed& /*speed*/,
                                              const core::Angle& angle)
 {
-  auto particle = gsl::make_shared<MutantBulletParticle>(location, world, angle);
+  auto particle = gsl_lite::make_shared<MutantBulletParticle>(location, world, angle);
   setParent(particle, location.room->node);
   return particle;
 }
@@ -744,7 +766,7 @@ gslu::nn_shared<Particle> createMutantGrenade(world::World& world,
                                               const core::Speed& /*speed*/,
                                               const core::Angle& angle)
 {
-  auto particle = gsl::make_shared<MutantGrenadeParticle>(location, world, angle);
+  auto particle = gsl_lite::make_shared<MutantGrenadeParticle>(location, world, angle);
   setParent(particle, location.room->node);
   return particle;
 }
@@ -752,8 +774,8 @@ gslu::nn_shared<Particle> createMutantGrenade(world::World& world,
 gslu::nn_shared<Particle>
   createBloodSplat(world::World& world, const Location& location, const core::Speed& speed, const core::Angle& angle)
 {
-  auto particle = gsl::make_shared<BloodSplatterParticle>(location, speed, angle, world);
+  auto particle = gsl_lite::make_shared<BloodSplatterParticle>(location, speed, angle, world);
   setParent(particle, location.room->node);
   return particle;
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/particle.h b/src/engine/particle.h
index 95d1fb83d..5ae4d6686 100644
--- a/src/engine/particle.h
+++ b/src/engine/particle.h
@@ -14,7 +14,7 @@
 #include <deque>
 #include <gl/soglb_fwd.h>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -45,7 +45,9 @@ class Particle
 {
 public:
   Location location;
+  core::TRVec predictedPosition;
   core::TRRotation angle;
+  core::TRRotation predictedAngle;
   core::TypeId object_number;
   core::Speed speed = 0_spd;
   core::Speed fall_speed = 0_spd;
@@ -79,7 +81,7 @@ class Particle
 public:
   explicit Particle(const std::string& id,
                     const core::TypeId& objectNumber,
-                    const gsl::not_null<const world::Room*>& room,
+                    const gsl_lite::not_null<const world::Room*>& room,
                     world::World& world,
                     render::material::SpriteMaterialMode mode,
                     bool withoutParent = false,
@@ -98,11 +100,12 @@ class Particle
     m_shade = shade;
   }
 
-  virtual bool update(world::World& world) = 0;
+  virtual bool updateLogic(world::World& world) = 0;
 
   glm::vec3 getPosition() const final;
 
-  void applyTransform();
+  void applyLogicTransform();
+  void interpolateTransform(float interTickFactor);
 
   [[nodiscard]] bool withoutParent() const noexcept
   {
@@ -118,7 +121,7 @@ class BloodSplatterParticle final : public Particle
                                  const core::Angle& angle_,
                                  world::World& world);
 
-  bool update(world::World& world) override;
+  bool updateLogic(world::World& world) override;
 };
 
 class SplashParticle final : public Particle
@@ -126,7 +129,7 @@ class SplashParticle final : public Particle
 public:
   explicit SplashParticle(const Location& location, world::World& world, bool waterfall);
 
-  bool update(world::World& world) override;
+  bool updateLogic(world::World& world) override;
 };
 
 class RicochetParticle final : public Particle
@@ -134,7 +137,7 @@ class RicochetParticle final : public Particle
 public:
   explicit RicochetParticle(const Location& location, world::World& world);
 
-  bool update(world::World& /*world*/) override;
+  bool updateLogic(world::World& /*world*/) override;
 };
 
 class BubbleParticle final : public Particle
@@ -145,7 +148,7 @@ class BubbleParticle final : public Particle
                           bool onlyInWater = true,
                           bool instanced = false);
 
-  bool update(world::World& world) override;
+  bool updateLogic(world::World& world) override;
 
   core::Length circleRadius = 11_len;
 
@@ -158,7 +161,7 @@ class SparkleParticle final : public Particle
 public:
   explicit SparkleParticle(const Location& location, world::World& world);
 
-  bool update(world::World& /*world*/) override;
+  bool updateLogic(world::World& /*world*/) override;
 };
 
 class MuzzleFlashParticle final : public Particle
@@ -166,7 +169,7 @@ class MuzzleFlashParticle final : public Particle
 public:
   explicit MuzzleFlashParticle(const Location& location, world::World& world, const core::Angle& yAngle);
 
-  bool update(world::World& /*world*/) override;
+  bool updateLogic(world::World& /*world*/) override;
 };
 
 class FlameParticle final : public Particle
@@ -174,7 +177,7 @@ class FlameParticle final : public Particle
 public:
   explicit FlameParticle(const Location& location, world::World& world, bool randomize = false);
 
-  bool update(world::World& world) override;
+  bool updateLogic(world::World& world) override;
 };
 
 class ExplosionParticle final : public Particle
@@ -185,7 +188,7 @@ class ExplosionParticle final : public Particle
                              const core::Speed& fallSpeed,
                              const core::TRRotation& angle);
 
-  bool update(world::World& /*world*/) override;
+  bool updateLogic(world::World& /*world*/) override;
 };
 
 class MeshShrapnelParticle final : public Particle
@@ -197,7 +200,7 @@ class MeshShrapnelParticle final : public Particle
                                 bool torsoBoss,
                                 const core::Length& damageRadius);
 
-  bool update(world::World& world) override;
+  bool updateLogic(world::World& world) override;
 
 private:
   core::Length m_damageRadius;
@@ -223,7 +226,7 @@ class MutantBulletParticle final : public MutantAmmoParticle
     aimLaraChest(world);
   }
 
-  bool update(world::World& world) override;
+  bool updateLogic(world::World& world) override;
 };
 
 class MutantGrenadeParticle final : public MutantAmmoParticle
@@ -237,7 +240,7 @@ class MutantGrenadeParticle final : public MutantAmmoParticle
     aimLaraChest(world);
   }
 
-  bool update(world::World& world) override;
+  bool updateLogic(world::World& world) override;
 };
 
 class LavaParticle final : public Particle
@@ -245,7 +248,7 @@ class LavaParticle final : public Particle
 public:
   explicit LavaParticle(const Location& location, world::World& world);
 
-  bool update(world::World& world) override;
+  bool updateLogic(world::World& world) override;
 };
 
 class SmokeParticle final : public Particle
@@ -253,7 +256,7 @@ class SmokeParticle final : public Particle
 public:
   explicit SmokeParticle(const Location& location, world::World& world, const core::TRRotation& rotation);
 
-  bool update(world::World& /*world*/) override;
+  bool updateLogic(world::World& /*world*/) override;
 };
 
 extern gslu::nn_shared<Particle>
diff --git a/src/engine/particlecollection.cpp b/src/engine/particlecollection.cpp
index baca7805f..6627d2f41 100644
--- a/src/engine/particlecollection.cpp
+++ b/src/engine/particlecollection.cpp
@@ -12,7 +12,7 @@
 #include <gl/debuggroup.h>
 #include <gl/vertexbuffer.h>
 #include <glm/mat4x4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 #include <memory>
@@ -28,24 +28,22 @@ void ParticleCollection::eraseParticle(const std::shared_ptr<Particle>& particle
   if(particle == nullptr)
     return;
 
-  const auto it = std::find_if(m_particles.begin(),
-                               m_particles.end(),
-                               [particle](const auto& p)
-                               {
-                                 return particle == p.get();
-                               });
+  const auto it = std::ranges::find_if(m_particles,
+                                       [particle](const auto& p)
+                                       {
+                                         return particle == p.get();
+                                       });
   if(it != m_particles.end())
     m_particles.erase(it);
 
-  setParent(gsl::not_null{particle}, nullptr);
+  setParent(gsl_lite::not_null{particle}, nullptr);
 }
 
 void ParticleCollection::update(world::World& world)
 {
-  auto currentParticles = std::move(m_particles);
-  for(const auto& particle : currentParticles)
+  for(const auto currentParticles = std::move(m_particles); const auto& particle : currentParticles)
   {
-    if(particle->update(world))
+    if(particle->updateLogic(world))
     {
       if(!particle->withoutParent())
         setParent(particle, particle->location.room->node);
@@ -76,14 +74,14 @@ void InstancedParticleCollection::render(const std::string& roomName,
     auto buffer = std::get<1>(particle->getCurrentMesh());
     if(buffer == nullptr)
       continue;
-    particle->applyTransform();
-    if(const auto it = buffersData.find(gsl::not_null{buffer}); it != buffersData.end())
+    particle->applyLogicTransform();
+    if(const auto it = buffersData.find(gsl_lite::not_null{buffer}); it != buffersData.end())
     {
       std::get<0>(it->second).emplace_back(particle->getTransform().modelMatrix);
     }
     else
     {
-      buffersData.emplace(gsl::not_null{buffer},
+      buffersData.emplace(gsl_lite::not_null{buffer},
                           std::tuple{std::vector{particle->getTransform().modelMatrix}, particle});
     }
   }
@@ -96,14 +94,14 @@ void InstancedParticleCollection::render(const std::string& roomName,
 
     m_lighting.bind(*particle, world);
     buffer->setSubData(data, 0);
-    auto mesh = std::get<0>(particle->getCurrentMesh());
-    mesh->render(particle.get().get(), context, gsl::narrow<gl::api::core::SizeType>(data.size()));
+    const auto mesh = std::get<0>(particle->getCurrentMesh());
+    mesh->render(particle.get().get(), context, gsl_lite::narrow<gl::api::core::SizeType>(data.size()));
   }
 }
 
 void InstancedParticleCollection::setAmbient(const world::Room& room)
 {
   m_lighting.ambient = toBrightness(room.ambientShade);
-  m_lighting.update(core::Shade{core::Shade::type(-1)}, room);
+  m_lighting.update(core::Shade{static_cast<core::Shade::type>(-1)}, room);
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/player.cpp b/src/engine/player.cpp
index eb96ba62a..63e04e0ec 100644
--- a/src/engine/player.cpp
+++ b/src/engine/player.cpp
@@ -73,7 +73,7 @@ void Player::accumulateStats()
   smallMedipacksTotal += std::exchange(smallMedipacks, 0);
   largeMedipacksTotal += std::exchange(largeMedipacks, 0);
   timeSpentTotal += std::exchange(timeSpent, 0_frame);
-  for(auto ammoType : {WeaponType::Pistols, WeaponType::Shotgun, WeaponType::Uzis, WeaponType::Magnums})
+  for(const auto ammoType : {WeaponType::Pistols, WeaponType::Shotgun, WeaponType::Uzis, WeaponType::Magnums})
   {
     auto& ammo = getInventory().getAmmo(ammoType);
     ammo.hitsTotal += std::exchange(ammo.hits, 0);
diff --git a/src/engine/presenter.cpp b/src/engine/presenter.cpp
index b25b88d57..3d8775fb6 100644
--- a/src/engine/presenter.cpp
+++ b/src/engine/presenter.cpp
@@ -12,23 +12,24 @@
 #include "objects/laraobject.h"
 #include "objects/objectstate.h"
 #include "particlecollection.h"
+#include "paths.h"
 #include "qs/qs.h"
 #include "render/material/material.h"
 #include "render/material/materialgroup.h"
 #include "render/material/materialmanager.h"
 #include "render/material/rendermode.h"
-#include "render/material/shadercache.h"
 #include "render/material/uniformparameter.h"
 #include "render/pass/config.h"
 #include "render/renderpipeline.h"
 #include "render/rendersettings.h"
+#include "render/rendersystem.h"
 #include "render/scene/camera.h"
 #include "render/scene/csm.h"
 #include "render/scene/mesh.h"
 #include "render/scene/node.h"
 #include "render/scene/renderable.h"
 #include "render/scene/rendercontext.h"
-#include "render/scene/renderer.h"
+#include "render/scene/scenegraph.h"
 #include "render/scene/screenoverlay.h"
 #include "render/scene/translucency.h"
 #include "render/scene/visitor.h"
@@ -63,13 +64,14 @@
 #include <glm/mat4x4.hpp>
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <initializer_list>
 #include <iterator>
 #include <limits>
 #include <memory>
 #include <optional>
+#include <thread>
 #include <unordered_set>
 #include <utility>
 #include <vector>
@@ -97,12 +99,11 @@ void prefillDepthBuffer(const engine::CameraController& cameraController, const
     if(room.node->isVisible())
       renderRooms.emplace_back(&room);
   }
-  std::sort(renderRooms.begin(),
-            renderRooms.end(),
-            [](const engine::world::Room* a, const engine::world::Room* b)
-            {
-              return a->node->getRenderOrder() > b->node->getRenderOrder();
-            });
+  std::ranges::sort(renderRooms,
+                    [](const engine::world::Room* a, const engine::world::Room* b)
+                    {
+                      return a->node->getRenderOrder() > b->node->getRenderOrder();
+                    });
 
   for(const auto translucencySelector : {render::scene::Translucency::Opaque, render::scene::Translucency::NonOpaque})
   {
@@ -137,22 +138,24 @@ void Presenter::playVideo(const std::filesystem::path& path)
 {
   util::ensureFileExists(path);
 
-  auto mesh = render::scene::createScreenQuad(
-    m_materialManager->getFlat(false, true, true), render::scene::Translucency::Opaque, "video");
+  const auto mesh = render::scene::createScreenQuad(
+    m_renderSystem->getMaterialManager().getFlat(false, true, true), render::scene::Translucency::Opaque, "video");
 
-  auto colorBuffer = gsl::make_shared<gl::Texture2D<gl::SRGB8>>(getRenderViewport(), "ui-color");
-  auto fb = gl::FrameBufferBuilder()
-              .textureNoBlend(gl::api::FramebufferAttachment::ColorAttachment0, colorBuffer)
-              .build("video-fb");
+  const auto colorBuffer = gsl_lite::make_shared<gl::Texture2D<gl::SRGB8>>(getRenderViewport(), "ui-color");
+  const auto fb = gl::FrameBufferBuilder()
+                    .textureNoBlend(gl::api::FramebufferAttachment::ColorAttachment0, colorBuffer)
+                    .build("video-fb");
 
   video::play(path,
               m_soundEngine->getDevice(),
               [&](const gslu::nn_shared<gl::TextureHandle<gl::Texture2D<gl::SRGB8>>>& textureHandle)
               {
-                if(!preFrame())
+                if(!beginFrame())
                   return true;
 
-                m_renderer->getCamera()->setViewport(getRenderViewport());
+                m_inputHandler->update();
+
+                m_renderSystem->getCamera()->setViewport(getRenderViewport());
                 mesh->bind("u_input",
                            [&textureHandle](const render::scene::Node* /*node*/,
                                             const render::scene::Mesh& /*mesh*/,
@@ -163,7 +166,7 @@ void Presenter::playVideo(const std::filesystem::path& path)
                 mesh->getMaterialGroup()
                   .get(render::material::RenderMode::FullOpaque)
                   ->getUniformBlock("Camera")
-                  ->bindCameraBuffer(m_renderer->getCamera());
+                  ->bindCameraBuffer(m_renderSystem->getCamera());
                 mesh->getRenderState().setViewport(getRenderViewport());
 
                 GL_ASSERT(gl::api::memoryBarrier(gl::api::MemoryBarrierMask::UniformBarrierBit
@@ -175,70 +178,31 @@ void Presenter::playVideo(const std::filesystem::path& path)
                   mesh->render(nullptr, context);
                 }
                 updateSoundEngine();
-                fb->blit(*m_renderPipeline->getBackbuffer());
+                fb->blit(*m_renderSystem->getRenderPipeline().getBackbuffer());
                 swapBuffers();
                 return !m_window->windowShouldClose() && !m_inputHandler->hasDebouncedAction(hid::Action::Menu);
               });
 }
 
-void Presenter::renderWorld(const std::vector<world::Room>& rooms,
-                            const CameraController& cameraController,
-                            const std::unordered_set<const world::Portal*>& waterEntryPortals,
-                            const engine::world::World& world)
+void Presenter::renderWorldGeometryFramebuffers(const std::vector<world::Room>& visibleRooms,
+                                                const CameraController& cameraController,
+                                                const std::unordered_set<const world::Portal*>& waterSurfacePortals,
+                                                const world::World& world)
 {
-  m_renderPipeline->updateCamera(m_renderer->getCamera());
+  m_renderSystem->getRenderPipeline().updateCameraData(m_renderSystem->getCamera());
 
-  {
-    SOGLB_DEBUGGROUP("csm-pass");
-    gl::RenderState::resetWantedState();
-    gl::RenderState::getWantedState().setDepthClamp(true);
-    m_csm->updateCamera(*m_renderer->getCamera());
+  renderCsmBuffers(visibleRooms);
 
-    for(size_t i = 0; i < render::scene::CSMBuffer::NSplits; ++i)
+  m_renderSystem->getRenderPipeline().renderGeometryFrameBuffer(
+    [this, &world, &cameraController, &visibleRooms]
     {
-      m_csm->setActiveSplit(i);
-      m_csm->renderToActiveDepthBuffer(
-        [&rooms](const gl::RenderState& fbRenderState, const glm::mat4& vpMatrix)
-        {
-          gl::RenderState::getWantedState() = fbRenderState;
-
-          for(const auto translucencySelector :
-              {render::scene::Translucency::Opaque, render::scene::Translucency::NonOpaque})
-          {
-            render::scene::RenderContext context{
-              render::material::RenderMode::CSMDepthOnly, vpMatrix, translucencySelector};
-            render::scene::Visitor visitor{gsl::not_null{&context}, false};
-            for(const auto& room : rooms)
-            {
-              if(!room.node->isVisible())
-                continue;
-
-              for(const auto& child : room.node->getChildren())
-              {
-                visitor.visit(*child);
-              }
-            }
-            visitor.render(glm::vec3{0.0f, 0.0f, std::numeric_limits<float>::lowest()});
-          }
-        });
-    }
-
-    m_csm->renderSquareBuffers();
-    m_csm->renderBlurBuffers();
-  }
+      prefillDepthBuffer(cameraController, visibleRooms);
+      renderGeometry(world, visibleRooms);
+    },
+    cameraController.getCamera()->getFarPlane());
 
-  {
-    m_renderPipeline->renderGeometryFrameBuffer(
-      [this, &world, &cameraController, &rooms]()
-      {
-        prefillDepthBuffer(cameraController, rooms);
-        renderGeometry(world, rooms);
-      },
-      cameraController.getCamera()->getFarPlane());
-  }
-
-  m_renderPipeline->renderPortalFrameBuffer(
-    [&cameraController, &waterEntryPortals](const gl::RenderState& fbRenderState)
+  m_renderSystem->getRenderPipeline().renderPortalFrameBuffer(
+    [&cameraController, &waterSurfacePortals](const gl::RenderState& fbRenderState)
     {
       gl::RenderState::resetWantedState();
 
@@ -250,7 +214,7 @@ void Presenter::renderWorld(const std::vector<world::Room>& rooms,
                                              translucencySelector};
 
         context.pushState(fbRenderState);
-        for(const auto& portal : waterEntryPortals)
+        for(const auto& portal : waterSurfacePortals)
         {
           portal->mesh->render(nullptr, context);
         }
@@ -258,10 +222,50 @@ void Presenter::renderWorld(const std::vector<world::Room>& rooms,
       }
     });
 
-  m_renderPipeline->worldCompositionPass(rooms, cameraController.getCurrentRoom()->isWaterRoom);
+  m_renderSystem->getRenderPipeline().worldCompositionPassToBackbuffer(visibleRooms,
+                                                                       cameraController.getCurrentRoom()->isWaterRoom);
   m_screenOverlay.reset();
 }
 
+void Presenter::renderCsmBuffers(const std::vector<world::Room>& visibleRooms)
+{
+  gl::RenderState::resetWantedState();
+  gl::RenderState::getWantedState().setDepthClamp(true);
+  m_renderSystem->getCSM().updateCamera(*m_renderSystem->getCamera());
+
+  for(size_t i = 0; i < render::scene::CSMBuffer::NSplits; ++i)
+  {
+    m_renderSystem->getCSM().setActiveSplit(i);
+    m_renderSystem->getCSM().renderToActiveDepthBuffer(
+      [&visibleRooms](const gl::RenderState& fbRenderState, const glm::mat4& vpMatrix)
+      {
+        gl::RenderState::getWantedState() = fbRenderState;
+
+        for(const auto translucencySelector :
+            {render::scene::Translucency::Opaque, render::scene::Translucency::NonOpaque})
+        {
+          render::scene::RenderContext context{
+            render::material::RenderMode::CSMDepthOnly, vpMatrix, translucencySelector};
+          render::scene::Visitor visitor{gsl_lite::not_null{&context}, false};
+          for(const auto& room : visibleRooms)
+          {
+            if(!room.node->isVisible())
+              continue;
+
+            for(const auto& child : room.node->getChildren())
+            {
+              visitor.visit(*child);
+            }
+          }
+          visitor.render(glm::vec3{0.0f, 0.0f, std::numeric_limits<float>::lowest()});
+        }
+      });
+  }
+
+  m_renderSystem->getCSM().renderSquareBuffers();
+  m_renderSystem->getCSM().renderBlurBuffers();
+}
+
 namespace
 {
 constexpr size_t BarColors = 5;
@@ -283,14 +287,14 @@ gl::SRGBA8 getBarColor(float x, const std::array<gl::SRGBA8, BarColors>& barColo
   return gl::imix(a, b, static_cast<uint8_t>(glm::mod(x, 1.0f) * 256));
 }
 
-void drawBar(ui::Ui& ui,
-             const glm::ivec2& xy0,
-             const int p,
-             // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-             const gl::SRGBA8& black,
-             const gl::SRGBA8& border1,
-             const gl::SRGBA8& border2,
-             const std::array<gl::SRGBA8, BarColors>& barColors)
+void constructBar(ui::Ui& ui,
+                  const glm::ivec2& xy0,
+                  const int p,
+                  // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
+                  const gl::SRGBA8& black,
+                  const gl::SRGBA8& border1,
+                  const gl::SRGBA8& border2,
+                  const std::array<gl::SRGBA8, BarColors>& barColors)
 {
   ui.drawBox(xy0 + glm::ivec2{-1, -1}, {BarWidth + 3, BarHeight + 2}, black);
   ui.drawHLine(xy0 + glm::ivec2{-2, BarHeight + 1}, BarWidth + 4, border1);
@@ -306,30 +310,30 @@ void drawBar(ui::Ui& ui,
 }
 } // namespace
 
-void Presenter::drawBars(ui::Ui& ui,
-                         const std::array<gl::SRGBA8, 256>& palette,
-                         const ObjectManager& objectManager,
-                         bool pulse)
+void Presenter::constructBars(ui::Ui& ui,
+                              const std::array<gl::SRGBA8, 256>& palette,
+                              const ObjectManager& objectManager,
+                              const bool pulse)
 {
   if(objectManager.getLara().isInWater())
   {
-    drawBar(ui,
-            {ui.getSize().x - BarWidth - 10, 8},
-            std::clamp(objectManager.getLara().getAir() * BarWidth / core::LaraAir, 0, BarWidth),
-            palette[0],
-            palette[17],
-            palette[19],
-            {
-              palette[32],
-              palette[41],
-              palette[32],
-              palette[19],
-              palette[21],
-            });
+    constructBar(ui,
+                 {ui.getSize().x - BarWidth - 10, 8},
+                 std::clamp(objectManager.getLara().getAir() * BarWidth / core::LaraAir, 0, BarWidth),
+                 palette[0],
+                 palette[17],
+                 palette[19],
+                 {
+                   palette[32],
+                   palette[41],
+                   palette[32],
+                   palette[19],
+                   palette[21],
+                 });
   }
 
   if(objectManager.getLara().getHandStatus() == objects::HandStatus::Combat || objectManager.getLara().isDead())
-    m_healthBarTimeout = DefaultHealthBarTimeout;
+    m_healthBarTimeout = core::DefaultHealthBarTimeout;
 
   {
     const auto laraHealth = std::max(0_hp, objectManager.getLara().m_state.health);
@@ -340,26 +344,26 @@ void Presenter::drawBars(ui::Ui& ui,
       newHealth = std::min(m_drawnHealth + HealthChangeDeltaPerFrame, laraHealth);
 
     if(std::exchange(m_drawnHealth, newHealth) != laraHealth)
-      m_healthBarTimeout = DefaultHealthBarTimeout;
+      m_healthBarTimeout = core::DefaultHealthBarTimeout;
   }
 
   m_healthBarTimeout -= 1_frame;
 
   if(pulse)
   {
-    if(m_drawnHealth > HealthPulseMaxHealth && m_healthBarTimeout <= -DefaultHealthBarTimeout)
+    if(m_drawnHealth > HealthPulseMaxHealth && m_healthBarTimeout <= -core::DefaultHealthBarTimeout)
       return;
   }
   else
   {
-    if(m_healthBarTimeout <= -DefaultHealthBarTimeout)
+    if(m_healthBarTimeout <= -core::DefaultHealthBarTimeout)
       return;
   }
 
   uint8_t alpha = 255;
   if(m_healthBarTimeout < 0_frame)
   {
-    alpha = gsl::narrow_cast<uint8_t>(std::clamp(255 - std::abs(255 * m_healthBarTimeout / 40_frame), 0, 255));
+    alpha = gsl_lite::narrow_cast<uint8_t>(std::clamp(255 - std::abs(255 * m_healthBarTimeout / 40_frame), 0, 255));
   }
 
   if(pulse && m_drawnHealth <= HealthPulseMaxHealth)
@@ -385,25 +389,25 @@ void Presenter::drawBars(ui::Ui& ui,
     alpha = glm::mix(alpha, PulseTargetAlpha, currentPulseEffectStrength);
   }
 
-  static const auto withAlpha = [](gl::SRGBA8 color, uint8_t alpha)
+  static const auto withAlpha = [](gl::SRGBA8 color, const uint8_t alpha)
   {
     color.channels.a = alpha;
     return color;
   };
 
-  drawBar(ui,
-          {8, 8},
-          std::clamp(m_drawnHealth * BarWidth / core::LaraHealth, 0, BarWidth),
-          withAlpha(palette[0], alpha),
-          withAlpha(palette[17], alpha),
-          withAlpha(palette[19], alpha),
-          {
-            withAlpha(palette[8], alpha),
-            withAlpha(palette[11], alpha),
-            withAlpha(palette[8], alpha),
-            withAlpha(palette[6], alpha),
-            withAlpha(palette[24], alpha),
-          });
+  constructBar(ui,
+               {8, 8},
+               std::clamp(m_drawnHealth * BarWidth / core::LaraHealth, 0, BarWidth),
+               withAlpha(palette[0], alpha),
+               withAlpha(palette[17], alpha),
+               withAlpha(palette[19], alpha),
+               {
+                 withAlpha(palette[8], alpha),
+                 withAlpha(palette[11], alpha),
+                 withAlpha(palette[8], alpha),
+                 withAlpha(palette[6], alpha),
+                 withAlpha(palette[24], alpha),
+               });
 }
 
 namespace
@@ -412,13 +416,12 @@ std::vector<std::filesystem::path> getIconPaths(const std::filesystem::path& bas
 {
   std::vector<std::filesystem::path> result;
   result.reserve(sizes.size());
-  std::transform(sizes.begin(),
-                 sizes.end(),
-                 std::back_inserter(result),
-                 [&base](const auto& size)
-                 {
-                   return util::ensureFileExists(base / ("logo_" + std::to_string(size) + ".png"));
-                 });
+  std::ranges::transform(sizes,
+                         std::back_inserter(result),
+                         [&base](const auto& size)
+                         {
+                           return util::ensureFileExists(base / ("logo_" + std::to_string(size) + ".png"));
+                         });
   return result;
 }
 } // namespace
@@ -426,27 +429,27 @@ std::vector<std::filesystem::path> getIconPaths(const std::filesystem::path& bas
 Presenter::Presenter(const std::filesystem::path& engineDataPath,
                      const glm::ivec2& resolution,
                      const render::RenderSettings& renderSettings,
-                     const bool borderlessFullscreen)
-    : m_window{std::make_shared<gl::Window>(
+                     const bool borderlessFullscreen,
+                     std::function<float()> interTickFactorProvider)
+    : m_window{gsl_lite::make_shared<gl::Window>(
         getIconPaths(engineDataPath, {24, 32, 64, 128, 256, 512}), resolution, borderlessFullscreen)}
-    , m_soundEngine{std::make_shared<audio::SoundEngine>()}
-    , m_renderer{std::make_shared<render::scene::Renderer>(
-        gsl::make_shared<render::scene::Camera>(DefaultFov, getRenderViewport(), DefaultNearPlane, DefaultFarPlane))}
-    , m_splashImageTexture{gsl::make_shared<gl::TextureHandle<gl::Texture2D<gl::PremultipliedSRGBA8>>>(
+    , m_soundEngine{gsl_lite::make_shared<audio::SoundEngine>()}
+    , m_sceneGraph{gsl_lite::make_shared<render::scene::SceneGraph>(gsl_lite::make_shared<render::scene::Camera>(
+        core::DefaultFov, getRenderViewport(), core::DefaultNearPlane, core::DefaultFarPlane))}
+    , m_splashImageTexture{gsl_lite::make_shared<gl::TextureHandle<gl::Texture2D<gl::PremultipliedSRGBA8>>>(
         gl::CImgWrapper{util::ensureFileExists(engineDataPath / "splash.png")}.toTexture("splash"),
-        gsl::make_unique<gl::Sampler>("splash" + gl::SamplerSuffix))}
-    , m_trTTFFont{std::make_unique<gl::Font>(util::ensureFileExists(engineDataPath / "SteinAntik-Bold.ttf"))}
-    , m_ghostNameFont{std::make_unique<gl::Font>(util::ensureFileExists(engineDataPath / "Roboto-Regular.ttf"))}
-    , m_inputHandler{std::make_unique<hid::InputHandler>(m_window, engineDataPath / "gamecontrollerdb.txt")}
-    , m_shaderCache{std::make_shared<render::material::ShaderCache>(engineDataPath / "shaders")}
-    , m_materialManager{std::make_unique<render::material::MaterialManager>(m_shaderCache, m_renderer)}
-    , m_csm{std::make_shared<render::scene::CSM>(renderSettings.getCSMResolution(), *m_materialManager)}
-    , m_renderPipeline{std::make_unique<render::RenderPipeline>(
-        *m_materialManager, getRenderViewport(), getUiViewport(), getDisplayViewport())}
+        gsl_lite::make_unique<gl::Sampler>("splash" + gl::SamplerSuffix))}
+    , m_trTTFFont{gsl_lite::make_unique<gl::Font>(util::ensureFileExists(engineDataPath / "SteinAntik-Bold.ttf"))}
+    , m_ghostNameFont{gsl_lite::make_unique<gl::Font>(util::ensureFileExists(engineDataPath / "Roboto-Regular.ttf"))}
+    , m_inputHandler{gsl_lite::make_unique<hid::InputHandler>(m_window, engineDataPath / "gamecontrollerdb.txt")}
+    , m_renderSystem{gsl_lite::make_unique<render::RenderSystem>(engineDataPath,
+                                                                 getRenderViewport(),
+                                                                 getUiViewport(),
+                                                                 getDisplayViewport(),
+                                                                 renderSettings,
+                                                                 std::move(interTickFactorProvider))}
 {
   gl::RenderState::reset();
-
-  m_materialManager->setCSM(gsl::not_null{m_csm});
   scaleSplashImage();
   drawLoadingScreen(_("Booting"));
 }
@@ -464,17 +467,17 @@ void Presenter::scaleSplashImage()
 
   const auto scaledSourceSize = sourceSize * splashScale;
   const auto sourceOffset = (viewport - scaledSourceSize) / 2.0f;
-  auto mesh = render::scene::createScreenQuad(sourceOffset,
-                                              scaledSourceSize,
-                                              m_materialManager->getBackdrop(false),
-                                              render::scene::Translucency::Opaque,
-                                              "backdrop");
+  const auto mesh = render::scene::createScreenQuad(sourceOffset,
+                                                    scaledSourceSize,
+                                                    m_renderSystem->getMaterialManager().getBackdrop(false),
+                                                    render::scene::Translucency::Opaque,
+                                                    "backdrop");
   if(m_splashImageTextureOverride != nullptr)
     m_splashImageMeshOverride = mesh;
   else
     m_splashImageMesh = mesh;
   mesh->bind("u_input",
-             [srcTexture = gsl::not_null{srcTexture}](
+             [srcTexture = gsl_lite::not_null{srcTexture}](
                const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
              {
                uniform.set(srcTexture);
@@ -483,7 +486,7 @@ void Presenter::scaleSplashImage()
 
 void Presenter::drawLoadingScreen(const std::string& state)
 {
-  if(!preFrame())
+  if(!beginFrame())
     return;
 
   if(m_screenOverlay == nullptr)
@@ -491,7 +494,7 @@ void Presenter::drawLoadingScreen(const std::string& state)
 
   if(m_screenOverlay->getImage()->getSize() != getDisplayViewport())
   {
-    m_screenOverlay->init(*m_materialManager, getDisplayViewport());
+    m_screenOverlay->init(m_renderSystem->getMaterialManager(), getDisplayViewport());
     scaleSplashImage();
   }
 
@@ -502,11 +505,11 @@ void Presenter::drawLoadingScreen(const std::string& state)
                         gl::PremultipliedSRGBA8{255, 255, 255, 255},
                         StatusLineFontSize);
 
-  m_renderer->getCamera()->setViewport(getDisplayViewport());
+  m_renderSystem->getCamera()->setViewport(getDisplayViewport());
   getSplashImageMeshOrOverride()->getRenderState().setViewport(getDisplayViewport());
 
-  m_renderPipeline->withBackbuffer(
-    [this]()
+  m_renderSystem->getRenderPipeline().withBackbuffer(
+    [this]
     {
       {
         render::scene::RenderContext context{
@@ -526,30 +529,32 @@ void Presenter::drawLoadingScreen(const std::string& state)
   swapBuffers();
 }
 
-bool Presenter::preFrame()
+bool Presenter::beginFrame()
 {
   m_window->updateWindowSize();
   if(m_window->isMinimized())
+  {
+    std::this_thread::sleep_for(std::chrono::milliseconds{100});
     return false;
+  }
 
-  m_renderer->getCamera()->setViewport(getRenderViewport());
-  m_renderPipeline->resize(*m_materialManager, getRenderViewport(), getUiViewport(), getDisplayViewport());
+  m_renderSystem->getCamera()->setViewport(getRenderViewport());
+  m_renderSystem->getRenderPipeline().resize(
+    m_renderSystem->getMaterialManager(), getRenderViewport(), getUiViewport(), getDisplayViewport());
   if(m_screenOverlay != nullptr)
   {
     if(m_screenOverlay->getImage()->getSize() != getDisplayViewport())
     {
-      m_screenOverlay->init(*m_materialManager, getDisplayViewport());
+      m_screenOverlay->init(m_renderSystem->getMaterialManager(), getDisplayViewport());
     }
 
     m_screenOverlay->getImage()->fill({0, 0, 0, 0});
   }
 
-  m_inputHandler->update();
-
-  m_renderer->clear(
+  m_renderSystem->getSceneGraph().clear(
     gl::api::ClearBufferMask::ColorBufferBit | gl::api::ClearBufferMask::DepthBufferBit, {0, 0, 0, 0}, 1);
 
-  m_renderPipeline->resetBackbuffer();
+  m_renderSystem->getRenderPipeline().resetBackbuffer();
 
   m_renderSettingsChanged = false;
 
@@ -568,14 +573,14 @@ void Presenter::setTrFont(std::unique_ptr<ui::TRFont>&& font) noexcept
 
 void Presenter::swapBuffers()
 {
-  m_renderPipeline->renderBackbufferEffects();
+  m_renderSystem->getRenderPipeline().renderBackbufferEffects();
   m_window->swapBuffers();
 }
 
 void Presenter::clear()
 {
-  m_renderer->resetRootNode();
-  m_renderer->getCamera()->setFieldOfView(DefaultFov);
+  m_renderSystem->getSceneGraph().resetRootNode();
+  m_renderSystem->getCamera()->setFieldOfView(core::DefaultFov);
 }
 
 void Presenter::debounceInput()
@@ -588,18 +593,8 @@ void Presenter::apply(const render::RenderSettings& renderSettings, const AudioS
 {
   m_renderResolutionDivisor = renderSettings.renderResolutionDivisorActive ? renderSettings.renderResolutionDivisor : 1;
   m_uiScale = renderSettings.uiScaleActive ? renderSettings.uiScaleMultiplier : 1;
-  m_renderer->getCamera()->setViewport(getRenderViewport());
   setFullscreen(renderSettings.fullscreen);
-  if(m_csm->getResolution() != renderSettings.getCSMResolution())
-  {
-    m_csm = gsl::make_shared<render::scene::CSM>(renderSettings.getCSMResolution(), *m_materialManager);
-    m_materialManager->setCSM(m_csm);
-  }
-  m_renderPipeline->apply(renderSettings, *m_materialManager);
-  m_materialManager->setFiltering(renderSettings.bilinearFiltering,
-                                  !renderSettings.anisotropyActive
-                                    ? std::nullopt
-                                    : std::optional{gsl::narrow<float>(renderSettings.anisotropyLevel)});
+  m_renderSystem->apply(renderSettings, getRenderViewport(), getUiViewport(), getDisplayViewport());
   m_soundEngine->setListenerGain(audioSettings.globalVolume);
   m_renderSettingsChanged = true;
 }
@@ -609,7 +604,7 @@ gl::CImgWrapper Presenter::takeScreenshot() const
   const auto vp = getDisplayViewport();
 
   std::vector<uint8_t> pixels;
-  pixels.resize(gsl::narrow<size_t>(vp.x) * gsl::narrow<size_t>(vp.y) * 4u);
+  pixels.resize(gsl_lite::narrow<size_t>(vp.x) * gsl_lite::narrow<size_t>(vp.y) * 4u);
   GL_ASSERT(
     gl::api::readPixel(0, 0, vp.x, vp.y, gl::api::PixelFormat::Rgba, gl::api::PixelType::UnsignedByte, pixels.data()));
 
@@ -618,29 +613,33 @@ gl::CImgWrapper Presenter::takeScreenshot() const
   return img;
 }
 
-void Presenter::renderScreenOverlay()
+void Presenter::renderScreenOverlayToBackbuffer()
 {
   if(m_screenOverlay == nullptr)
     return;
 
   SOGLB_DEBUGGROUP("screen-overlay-pass");
-  gl::RenderState::resetWantedState();
-  m_renderer->getCamera()->setViewport(getDisplayViewport());
-  gl::RenderState::getWantedState().setViewport(getDisplayViewport());
-  render::scene::RenderContext context{
-    render::material::RenderMode::FullNonOpaque, std::nullopt, render::scene::Translucency::NonOpaque};
-  m_screenOverlay->render(nullptr, context);
+  m_renderSystem->getRenderPipeline().withBackbuffer(
+    [this]
+    {
+      gl::RenderState::resetWantedState();
+      m_renderSystem->getCamera()->setViewport(getDisplayViewport());
+      gl::RenderState::getWantedState().setViewport(getDisplayViewport());
+      render::scene::RenderContext context{
+        render::material::RenderMode::FullNonOpaque, std::nullopt, render::scene::Translucency::NonOpaque};
+      m_screenOverlay->render(nullptr, context);
+    });
 }
 
-void Presenter::renderUi(ui::Ui& ui, float alpha)
+void Presenter::renderUiToBackbuffer(ui::Ui& ui, const float alpha)
 {
-  m_renderPipeline->renderUiFrameBuffer(
-    [this, &ui]()
+  m_renderSystem->getRenderPipeline().renderUiIntoFramebuffer(
+    [this, &ui]
     {
-      m_renderer->getCamera()->setViewport(getUiViewport());
+      m_renderSystem->getCamera()->setViewport(getUiViewport());
       ui.render();
     });
-  m_renderPipeline->renderUiFrameBuffer(alpha);
+  m_renderSystem->getRenderPipeline().renderUiFrameBufferToBackbuffer(alpha);
 }
 
 void Presenter::disableScreenOverlay() noexcept
@@ -665,16 +664,16 @@ glm::ivec2 Presenter::getUiViewport() const
   return m_window->getViewport() / static_cast<int>(m_uiScale);
 }
 
-void Presenter::withBackbuffer(const std::function<void()>& doRender)
+void Presenter::inBackbuffer(const std::function<void()>& doRender)
 {
-  m_renderPipeline->withBackbuffer(doRender);
+  m_renderSystem->getRenderPipeline().withBackbuffer(doRender);
 }
 
 void Presenter::setSplashImageTextureOverride(const std::filesystem::path& imagePath)
 {
   m_splashImageTextureOverride = std::make_shared<gl::TextureHandle<gl::Texture2D<gl::PremultipliedSRGBA8>>>(
     gl::CImgWrapper{util::ensureFileExists(imagePath)}.toTexture("splash-override"),
-    gsl::make_unique<gl::Sampler>("splash-override" + gl::SamplerSuffix));
+    gsl_lite::make_unique<gl::Sampler>("splash-override" + gl::SamplerSuffix));
   scaleSplashImage();
 }
 
@@ -684,9 +683,9 @@ void Presenter::clearSplashImageTextureOverride() noexcept
   m_splashImageMeshOverride.reset();
 }
 
-void Presenter::renderGeometry(const engine::world::World& world, const std::vector<world::Room>& rooms)
+void Presenter::renderGeometry(const world::World& world, const std::vector<world::Room>& rooms)
 {
-  m_renderer->render();
+  m_renderSystem->getSceneGraph().render();
   for(const auto translucencySelector : {render::scene::Translucency::Opaque, render::scene::Translucency::NonOpaque})
   {
     render::scene::RenderContext context{translucencySelector == render::scene::Translucency::Opaque
@@ -705,4 +704,4 @@ void Presenter::renderGeometry(const engine::world::World& world, const std::vec
     }
   }
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/presenter.h b/src/engine/presenter.h
index 64e91b6b7..3d97f0d6c 100644
--- a/src/engine/presenter.h
+++ b/src/engine/presenter.h
@@ -4,6 +4,7 @@
 #include "core/units.h"
 #include "qs/qs.h"
 #include "qs/quantity.h"
+#include "render/rendersystem.h"
 
 #include <array>
 #include <cstdint>
@@ -15,7 +16,7 @@
 #include <gl/window.h>
 #include <glm/trigonometric.hpp>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -40,21 +41,12 @@ class InputHandler;
 
 namespace render
 {
-class RenderPipeline;
 struct RenderSettings;
 } // namespace render
 
-namespace render::material
-{
-class MaterialManager;
-class ShaderCache;
-} // namespace render::material
-
 namespace render::scene
 {
-class CSM;
 class Mesh;
-class Renderer;
 class ScreenOverlay;
 } // namespace render::scene
 
@@ -74,42 +66,41 @@ struct AudioSettings;
 class Presenter final
 {
 public:
-  static const constexpr float DefaultNearPlane = 20.0f;
-  static const constexpr float DefaultFarPlane = 20480.0f;
-  static const constexpr float DefaultFov = glm::radians(60.0f);
-  static const constexpr core::Frame DefaultHealthBarTimeout = core::FrameRate * 1_sec * 4 / 3;
-
   explicit Presenter(const std::filesystem::path& engineDataPath,
                      const glm::ivec2& resolution,
                      const render::RenderSettings& renderSettings,
-                     bool borderlessFullscreen);
+                     bool borderlessFullscreen,
+                     std::function<float()> interTickFactorProvider);
   ~Presenter();
 
   void playVideo(const std::filesystem::path& path);
 
-  void renderWorld(const std::vector<world::Room>& rooms,
-                   const CameraController& cameraController,
-                   const std::unordered_set<const world::Portal*>& waterEntryPortals,
-                   const engine::world::World& world);
+  /**
+   * @brief Renders the world to the backbuffer.
+   */
+  void renderWorldGeometryFramebuffers(const std::vector<world::Room>& visibleRooms,
+                                       const CameraController& cameraController,
+                                       const std::unordered_set<const world::Portal*>& waterSurfacePortals,
+                                       const world::World& world);
 
   [[nodiscard]] const auto& getSoundEngine() const noexcept
   {
     return m_soundEngine;
   }
 
-  const auto& getMaterialManager() noexcept
+  [[nodiscard]] auto& getRenderSystem() noexcept
   {
-    return m_materialManager;
+    return *m_renderSystem;
   }
 
-  [[nodiscard]] const auto& getMaterialManager() const noexcept
+  [[nodiscard]] const auto& getRenderSystem() const noexcept
   {
-    return m_materialManager;
+    return *m_renderSystem;
   }
 
   void initHealthBarTimeout() noexcept
   {
-    m_healthBarTimeout = DefaultHealthBarTimeout;
+    m_healthBarTimeout = core::DefaultHealthBarTimeout;
   }
 
   [[nodiscard]] const hid::InputHandler& getInputHandler() const
@@ -122,7 +113,10 @@ class Presenter final
     return *m_inputHandler;
   }
 
-  void drawBars(ui::Ui& ui, const std::array<gl::SRGBA8, 256>& palette, const ObjectManager& objectManager, bool pulse);
+  void constructBars(ui::Ui& ui,
+                     const std::array<gl::SRGBA8, 256>& palette,
+                     const ObjectManager& objectManager,
+                     bool pulse);
 
   [[nodiscard]] const ui::TRFont& getTrFont() const
   {
@@ -130,23 +124,16 @@ class Presenter final
     return *m_trFont;
   }
 
-  [[nodiscard]] const auto& getRenderer() const
-  {
-    return *m_renderer;
-  }
-
-  [[nodiscard]] auto& getRenderer()
-  {
-    return *m_renderer;
-  }
-
-  void renderScreenOverlay();
-  void renderUi(ui::Ui& ui, float alpha);
+  void renderScreenOverlayToBackbuffer();
+  /**
+   * @brief Renders the UI to the backbuffer.
+   */
+  void renderUiToBackbuffer(ui::Ui& ui, float alpha);
 
   void apply(const render::RenderSettings& renderSettings, const AudioSettings& audioSettings);
 
   void drawLoadingScreen(const std::string& state);
-  bool preFrame();
+  bool beginFrame();
   [[nodiscard]] bool shouldClose() const;
 
   void setTrFont(std::unique_ptr<ui::TRFont>&& font) noexcept;
@@ -157,7 +144,7 @@ class Presenter final
 
   void debounceInput();
 
-  void setFullscreen(bool value)
+  void setFullscreen(const bool value)
   {
     m_window->setFullscreen(value);
   }
@@ -177,7 +164,7 @@ class Presenter final
 
   void updateSoundEngine();
 
-  void withBackbuffer(const std::function<void()>& doRender);
+  void inBackbuffer(const std::function<void()>& doRender);
 
   [[nodiscard]] bool renderSettingsChanged() const noexcept
   {
@@ -197,8 +184,8 @@ class Presenter final
   uint8_t m_renderResolutionDivisor = 1;
   uint8_t m_uiScale = 1;
 
-  std::shared_ptr<audio::SoundEngine> m_soundEngine;
-  gslu::nn_shared<render::scene::Renderer> m_renderer;
+  gslu::nn_shared<audio::SoundEngine> m_soundEngine;
+  gslu::nn_shared<render::scene::SceneGraph> m_sceneGraph;
   gslu::nn_shared<gl::TextureHandle<gl::Texture2D<gl::PremultipliedSRGBA8>>> m_splashImageTexture;
   std::shared_ptr<gl::TextureHandle<gl::Texture2D<gl::PremultipliedSRGBA8>>> m_splashImageTextureOverride;
   std::shared_ptr<render::scene::Mesh> m_splashImageMesh;
@@ -207,15 +194,11 @@ class Presenter final
   gslu::nn_unique<gl::Font> m_ghostNameFont;
   core::Health m_drawnHealth = core::LaraHealth;
   core::Frame m_healthPulseTime = 0_frame;
-  core::Frame m_healthBarTimeout = -DefaultHealthBarTimeout;
+  core::Frame m_healthBarTimeout = -core::DefaultHealthBarTimeout;
   gslu::nn_unique<hid::InputHandler> m_inputHandler;
   std::unique_ptr<ui::TRFont> m_trFont;
 
-  gslu::nn_shared<render::material::ShaderCache> m_shaderCache;
-  gslu::nn_unique<render::material::MaterialManager> m_materialManager;
-  gslu::nn_shared<render::scene::CSM> m_csm;
-
-  gslu::nn_unique<render::RenderPipeline> m_renderPipeline;
+  gslu::nn_unique<render::RenderSystem> m_renderSystem;
   std::unique_ptr<render::scene::ScreenOverlay> m_screenOverlay;
 
   bool m_renderSettingsChanged = false;
@@ -229,6 +212,8 @@ class Presenter final
     return m_splashImageMesh;
   }
 
-  void renderGeometry(const engine::world::World& world, const std::vector<world::Room>& rooms);
+  void renderGeometry(const world::World& world, const std::vector<world::Room>& rooms);
+
+  void renderCsmBuffers(const std::vector<world::Room>& visibleRooms);
 };
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/raycast.cpp b/src/engine/raycast.cpp
index 08d667c45..752d648c7 100644
--- a/src/engine/raycast.cpp
+++ b/src/engine/raycast.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/assert.hpp>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <tuple>
 #include <utility>
 
@@ -25,8 +25,8 @@ bool clampY(const core::TRVec& start, Location& goal, const ObjectManager& objec
   const auto sector = goal.updateRoom();
   const auto delta = goal.position - start;
 
-  const auto goalFloor = HeightInfo::fromFloor(sector, goal.position, objectManager.getObjects()).y;
-  if(goalFloor < goal.position.Y && goalFloor > start.Y)
+  if(const auto goalFloor = HeightInfo::fromFloor(sector, goal.position, objectManager.getObjects()).y;
+     goalFloor < goal.position.Y && goalFloor > start.Y)
   {
     goal.position.Y = goalFloor;
     const auto dy = goalFloor - start.Y;
@@ -36,8 +36,8 @@ bool clampY(const core::TRVec& start, Location& goal, const ObjectManager& objec
     return false;
   }
 
-  const auto goalCeiling = HeightInfo::fromCeiling(sector, goal.position, objectManager.getObjects()).y;
-  if(goalCeiling > goal.position.Y && goalCeiling < start.Y)
+  if(const auto goalCeiling = HeightInfo::fromCeiling(sector, goal.position, objectManager.getObjects()).y;
+     goalCeiling > goal.position.Y && goalCeiling < start.Y)
   {
     goal.position.Y = goalCeiling;
     const auto dy = goalCeiling - start.Y;
@@ -60,8 +60,8 @@ enum class CollisionType : uint8_t
 std::pair<CollisionType, Location> clampSteps(const Location& start,
                                               const core::TRVec& goal,
                                               const ObjectManager& objectManager,
-                                              core::Length(core::TRVec::*stepAxis),
-                                              core::Length(core::TRVec::*secondaryAxis))
+                                              core::Length(core::TRVec::* stepAxis),
+                                              core::Length(core::TRVec::* secondaryAxis))
 {
   const auto delta = goal - start.position;
   if(delta.*stepAxis == 0_len)
@@ -121,15 +121,14 @@ std::pair<CollisionType, Location> clampSteps(const Location& start,
     result.position += sectorStep;
   }
 }
-
 } // namespace
 
 std::pair<bool, Location>
   raycastLineOfSight(const Location& start, const core::TRVec& goal, const ObjectManager& objectManager)
 {
   auto collide = [&start, &goal, &objectManager](
-                   core::Length(core::TRVec::*firstStepAxis),
-                   core::Length(core::TRVec::*secondStepAxis)) -> std::tuple<CollisionType, CollisionType, Location>
+                   core::Length(core::TRVec::* firstStepAxis),
+                   core::Length(core::TRVec::* secondStepAxis)) -> std::tuple<CollisionType, CollisionType, Location>
   {
     const auto [firstType, firstPos] = clampSteps(start, goal, objectManager, firstStepAxis, secondStepAxis);
     auto [secondType, secondPos] = clampSteps(start, firstPos.position, objectManager, secondStepAxis, firstStepAxis);
@@ -140,8 +139,8 @@ std::pair<bool, Location>
   auto [firstCollision, secondCollision, result] = abs(goal.Z - start.position.Z) <= abs(goal.X - start.position.X)
                                                      ? collide(&core::TRVec::Z, &core::TRVec::X)
                                                      : collide(&core::TRVec::X, &core::TRVec::Z);
-  const auto invariantCheck = gsl::finally(
-    [&result = result]()
+  const auto invariantCheck = gsl_lite::finally(
+    [&result]
     {
       gsl_Ensures(result.room->getSectorByAbsolutePosition(result.position) != nullptr);
     });
@@ -159,4 +158,4 @@ std::pair<bool, Location>
              : std::get<2>(collide(&core::TRVec::X, &core::TRVec::Z));
   return {success, result};
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/script/reflection.cpp b/src/engine/script/reflection.cpp
index 7e7a6b369..b0048519a 100644
--- a/src/engine/script/reflection.cpp
+++ b/src/engine/script/reflection.cpp
@@ -11,6 +11,7 @@
 #include "engine/engine.h"
 #include "engine/engineconfig.h"
 #include "engine/inventory.h"
+#include "engine/levelloopresult.h"
 #include "engine/location.h"
 #include "engine/objectmanager.h"
 #include "engine/objects/modelobject.h"
@@ -32,7 +33,7 @@
 #include "render/material/rendermode.h"
 #include "render/scene/mesh.h"
 #include "render/scene/rendercontext.h"
-#include "render/scene/renderer.h"
+#include "render/scene/scenegraph.h"
 #include "scriptengine.h"
 #include "util.h"
 #include "util/fsutil.h"
@@ -40,7 +41,6 @@
 
 #include <algorithm>
 #include <boost/log/trivial.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <boost/throw_exception.hpp>
 #include <chrono>
 #include <cstring>
@@ -53,12 +53,13 @@
 #include <gl/texture2d.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <map>
 #include <memory>
 #include <optional>
 #include <pybind11/pytypes.h>
 #include <pybind11/stl.h> // IWYU pragma: keep
+#include <ranges>
 #include <stdexcept>
 #include <string>
 #include <unordered_map>
@@ -74,11 +75,11 @@ namespace engine::script
 {
 namespace
 {
-std::unique_ptr<loader::file::level::Level> loadLevel(const gsl::not_null<Engine*>& engine,
+std::unique_ptr<loader::file::level::Level> loadLevel(const gsl_lite::not_null<Engine*>& engine,
                                                       // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
                                                       const std::string& localPath,
                                                       const std::string& title,
-                                                      loader::file::level::Game game)
+                                                      const loader::file::level::Game game)
 {
   engine->getPresenter().drawLoadingScreen(_("Loading %1%", title));
   auto level = loader::file::level::Level::createLoader(engine->getAssetDataPath() / localPath, game);
@@ -131,9 +132,9 @@ std::unique_ptr<loader::file::level::Level> loadLevel(const gsl::not_null<Engine
 }
 } // namespace
 
-std::pair<RunResult, std::optional<size_t>> Video::run(const gsl::not_null<Engine*>& engine,
-                                                       const std::shared_ptr<Player>& /*player*/,
-                                                       const std::shared_ptr<Player>& /*levelStartPlayer*/)
+std::pair<LevelLoopResult, std::optional<size_t>> Video::run(const gsl_lite::not_null<Engine*>& engine,
+                                                             const std::shared_ptr<Player>& /*player*/,
+                                                             const std::shared_ptr<Player>& /*levelStartPlayer*/)
 {
   engine->getPresenter().getSoundEngine()->reset();
   for(const auto& path : m_paths)
@@ -144,7 +145,7 @@ std::pair<RunResult, std::optional<size_t>> Video::run(const gsl::not_null<Engin
       break;
     }
   }
-  return {RunResult::NextLevel, std::nullopt};
+  return {LevelLoopResult::NextLevel, std::nullopt};
 }
 
 std::vector<std::filesystem::path> Video::getFilepathsIfInvalid(const std::filesystem::path& dataRoot) const
@@ -160,12 +161,12 @@ std::vector<std::filesystem::path> Video::getFilepathsIfInvalid(const std::files
   return m_paths;
 }
 
-std::pair<RunResult, std::optional<size_t>> Cutscene::run(const gsl::not_null<Engine*>& engine,
-                                                          const std::shared_ptr<Player>& player,
-                                                          const std::shared_ptr<Player>& levelStartPlayer)
+std::pair<LevelLoopResult, std::optional<size_t>> Cutscene::run(const gsl_lite::not_null<Engine*>& engine,
+                                                                const std::shared_ptr<Player>& player,
+                                                                const std::shared_ptr<Player>& levelStartPlayer)
 {
   engine->getPresenter().getSoundEngine()->reset();
-  auto world
+  const auto world
     = std::make_unique<world::World>(engine,
                                      loadLevel(engine, m_name, m_name, m_game),
                                      std::string{},
@@ -178,13 +179,13 @@ std::pair<RunResult, std::optional<size_t>> Cutscene::run(const gsl::not_null<En
                                      nullptr,
                                      std::filesystem::path{});
 
-  world->getCameraController().setEyeRotation(0_deg, m_cameraRot);
   auto pos = world->getCameraController().getTRLocation().position;
   if(m_cameraPosX.has_value())
     pos.X = *m_cameraPosX;
   if(m_cameraPosZ.has_value())
     pos.Z = *m_cameraPosZ;
-
+  world->getCameraController().startCinematic(pos, {0_deg, m_cameraRot, 0_deg});
+  world->getCameraController().setCinematicBaseRotation(0_deg, m_cameraRot);
   world->getCameraController().setPosition(pos);
 
   if(m_flipRooms)
@@ -194,7 +195,7 @@ std::pair<RunResult, std::optional<size_t>> Cutscene::run(const gsl::not_null<En
   {
     const auto& laraPistol = world->getWorldGeometry().findAnimatedModelForType(TR1ItemId::LaraPistolsAnim);
     gsl_Assert(laraPistol != nullptr);
-    for(const auto& object : world->getObjectManager().getObjects() | boost::adaptors::map_values)
+    for(const auto& object : world->getObjectManager().getObjects() | std::views::values)
     {
       if(object->m_state.type != TR1ItemId::CutsceneActor1)
         continue;
@@ -207,7 +208,7 @@ std::pair<RunResult, std::optional<size_t>> Cutscene::run(const gsl::not_null<En
     }
   }
 
-  return engine->run(*world, true, false);
+  return engine->runCutscene(*world);
 }
 
 std::vector<std::filesystem::path> Cutscene::getFilepathsIfInvalid(const std::filesystem::path& dataRoot) const
@@ -217,7 +218,7 @@ std::vector<std::filesystem::path> Cutscene::getFilepathsIfInvalid(const std::fi
   return {std::filesystem::path{m_name}};
 }
 
-std::unique_ptr<world::World> Level::loadWorld(const gsl::not_null<Engine*>& engine,
+std::unique_ptr<world::World> Level::loadWorld(const gsl_lite::not_null<Engine*>& engine,
                                                const std::shared_ptr<Player>& player,
                                                const std::shared_ptr<Player>& levelStartPlayer,
                                                bool fromSave)
@@ -248,7 +249,7 @@ std::unique_ptr<world::World> Level::loadWorld(const gsl::not_null<Engine*>& eng
                                               engine->getWorldGeometryCacheOrReset(m_name),
                                               m_name);
 
-  auto replace = [&world, &player](TR1ItemId meshType, TR1ItemId spriteType, TR1ItemId replacement)
+  auto replace = [&world, &player](const TR1ItemId meshType, const TR1ItemId spriteType, const TR1ItemId replacement)
   {
     if(player->getInventory().count(meshType) > 0 || player->getInventory().count(spriteType) > 0)
     {
@@ -259,18 +260,20 @@ std::unique_ptr<world::World> Level::loadWorld(const gsl::not_null<Engine*>& eng
   replace(TR1ItemId::Uzis, TR1ItemId::UzisSprite, TR1ItemId::UziAmmoSprite);
   replace(TR1ItemId::Magnums, TR1ItemId::MagnumsSprite, TR1ItemId::MagnumAmmoSprite);
 
-  for(auto a : {false, true})
+  for(const auto a : {false, true})
   {
-    for(auto b : {false, true})
+    for(const auto b : {false, true})
     {
       engine->getPresenter()
+        .getRenderSystem()
         .getMaterialManager()
-        ->getWorldComposition(a, b)
+        .getWorldComposition(a, b)
         ->getUniform("u_waterColor")
         ->set(m_waterColor);
       engine->getPresenter()
+        .getRenderSystem()
         .getMaterialManager()
-        ->getWorldComposition(a, b)
+        .getWorldComposition(a, b)
         ->getUniform("u_waterDensity")
         ->set(m_waterDensity);
     }
@@ -284,9 +287,9 @@ bool Level::isLevel(const std::filesystem::path& path) const
   return util::preferredEqual(std::filesystem::path(m_name), path);
 }
 
-std::pair<RunResult, std::optional<size_t>> Level::run(const gsl::not_null<Engine*>& engine,
-                                                       const std::shared_ptr<Player>& player,
-                                                       const std::shared_ptr<Player>& levelStartPlayer)
+std::pair<LevelLoopResult, std::optional<size_t>> Level::run(const gsl_lite::not_null<Engine*>& engine,
+                                                             const std::shared_ptr<Player>& player,
+                                                             const std::shared_ptr<Player>& levelStartPlayer)
 {
   if(m_alternativeSplashscreen.has_value()
      && std::filesystem::is_regular_file(
@@ -303,16 +306,16 @@ std::pair<RunResult, std::optional<size_t>> Level::run(const gsl::not_null<Engin
   if(engine->getEngineConfig()->restoreHealth)
     player->laraHealth = core::LaraHealth;
 
-  auto world = loadWorld(engine, player, levelStartPlayer, false);
-  auto result = engine->run(*world, false, m_allowSave);
+  const auto world = loadWorld(engine, player, levelStartPlayer, false);
+  const auto result = engine->runLevel(*world, m_allowSave);
   engine->getPresenter().clearSplashImageTextureOverride();
   return result;
 }
 
-std::pair<RunResult, std::optional<size_t>> Level::runFromSave(const gsl::not_null<Engine*>& engine,
-                                                               const std::optional<size_t>& slot,
-                                                               const std::shared_ptr<Player>& player,
-                                                               const std::shared_ptr<Player>& levelStartPlayer)
+std::pair<LevelLoopResult, std::optional<size_t>> Level::runFromSave(const gsl_lite::not_null<Engine*>& engine,
+                                                                     const std::optional<size_t>& slot,
+                                                                     const std::shared_ptr<Player>& player,
+                                                                     const std::shared_ptr<Player>& levelStartPlayer)
 {
   gsl_Expects(m_allowSave);
 
@@ -325,9 +328,9 @@ std::pair<RunResult, std::optional<size_t>> Level::runFromSave(const gsl::not_nu
 
   engine->getPresenter().getSoundEngine()->reset();
   player->getInventory().clear();
-  auto world = loadWorld(engine, player, levelStartPlayer, true);
+  const auto world = loadWorld(engine, player, levelStartPlayer, true);
   world->load(slot);
-  auto result = engine->run(*world, false, m_allowSave);
+  const auto result = engine->runLevel(*world, m_allowSave);
   engine->getPresenter().clearSplashImageTextureOverride();
   return result;
 }
@@ -344,22 +347,22 @@ std::filesystem::path Level::getFilepath() const
   return std::filesystem::path{m_name};
 }
 
-std::pair<RunResult, std::optional<size_t>> TitleMenu::run(const gsl::not_null<Engine*>& engine,
-                                                           const std::shared_ptr<Player>& player,
-                                                           const std::shared_ptr<Player>& levelStartPlayer)
+std::pair<LevelLoopResult, std::optional<size_t>> TitleMenu::run(const gsl_lite::not_null<Engine*>& engine,
+                                                                 const std::shared_ptr<Player>& player,
+                                                                 const std::shared_ptr<Player>& levelStartPlayer)
 {
   engine->getPresenter().getSoundEngine()->reset();
   player->getInventory().clear();
-  auto world = loadWorld(engine, player, levelStartPlayer, false);
+  const auto world = loadWorld(engine, player, levelStartPlayer, false);
   return engine->runTitleMenu(*world);
 }
 
 TitleMenu::TitleMenu(const std::string& name,
-                     bool useAlternativeLara,
+                     const bool useAlternativeLara,
                      const std::unordered_map<std::string, std::string>& titles,
                      const std::unordered_map<std::string, std::unordered_map<TR1ItemId, std::string>>& itemTitles,
-                     std::optional<TR1TrackId> ambient,
-                     loader::file::level::Game game)
+                     const std::optional<TR1TrackId> ambient,
+                     const loader::file::level::Game game)
     : Level{name,
             useAlternativeLara,
             titles,
@@ -375,7 +378,10 @@ TitleMenu::TitleMenu(const std::string& name,
 }
 
 // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-SplashScreen::SplashScreen(std::string path, int durationSeconds, int fadeInDurationSeconds, int fadeOutDurationSeconds)
+SplashScreen::SplashScreen(std::string path,
+                           const int durationSeconds,
+                           const int fadeInDurationSeconds,
+                           const int fadeOutDurationSeconds)
     : m_path{std::move(path)}
     , m_durationSeconds{durationSeconds}
     , m_fadeInDurationSeconds{fadeInDurationSeconds}
@@ -388,22 +394,21 @@ SplashScreen::SplashScreen(std::string path, int durationSeconds, int fadeInDura
 
 SplashScreen::~SplashScreen() = default;
 
-std::pair<RunResult, std::optional<size_t>> SplashScreen::run(const gsl::not_null<Engine*>& engine,
-                                                              const std::shared_ptr<Player>& /*player*/,
-                                                              const std::shared_ptr<Player>& /*levelStartPlayer*/)
+std::pair<LevelLoopResult, std::optional<size_t>> SplashScreen::run(const gsl_lite::not_null<Engine*>& engine,
+                                                                    const std::shared_ptr<Player>& /*player*/,
+                                                                    const std::shared_ptr<Player>& /*levelStartPlayer*/)
 {
-  Throttler throttler{};
-
   glm::ivec2 size{-1, -1};
-  auto image = gsl::make_shared<gl::TextureHandle<gl::Texture2D<gl::PremultipliedSRGBA8>>>(
+  auto image = gsl_lite::make_shared<gl::TextureHandle<gl::Texture2D<gl::PremultipliedSRGBA8>>>(
     gl::CImgWrapper{util::ensureFileExists(findCaseInsensitivePath(engine->getAssetDataPath(), m_path))}.toTexture(
       m_path.string()),
-    gsl::make_unique<gl::Sampler>(m_path.string() + gl::SamplerSuffix));
+    gsl_lite::make_unique<gl::Sampler>(m_path.string() + gl::SamplerSuffix));
   std::shared_ptr<render::scene::Mesh> mesh;
 
   auto& presenter = engine->getPresenter();
+  engine->getThrottler().reset();
   float alpha = 0;
-  auto updateSize = [this, &size, &presenter, &mesh, &image, &alpha]()
+  auto updateSize = [this, &size, &presenter, &mesh, &image, &alpha]
   {
     if(size == presenter.getRenderViewport())
       return;
@@ -419,7 +424,7 @@ std::pair<RunResult, std::optional<size_t>> SplashScreen::run(const gsl::not_nul
     const auto sourceOffset = (targetSize - scaledSourceSize) / 2.0f;
     mesh = render::scene::createScreenQuad(sourceOffset,
                                            scaledSourceSize,
-                                           presenter.getMaterialManager()->getBackdrop(true),
+                                           presenter.getRenderSystem().getMaterialManager().getBackdrop(true),
                                            render::scene::Translucency::Opaque,
                                            m_path.string());
     mesh->bind("u_input",
@@ -434,11 +439,16 @@ std::pair<RunResult, std::optional<size_t>> SplashScreen::run(const gsl::not_nul
                });
   };
 
-  auto renderFrame = [&presenter, &updateSize, &mesh, &throttler]() -> bool
+  auto renderFrame = [&presenter, &updateSize, &mesh, &throttler = engine->getThrottler()]() -> bool
   {
-    if(!presenter.preFrame() || presenter.shouldClose())
+    if(!presenter.beginFrame() || presenter.shouldClose())
       return false;
 
+    if(throttler.isTimeForLogic())
+    {
+      presenter.getInputHandler().update();
+    }
+
     if(presenter.getInputHandler().hasDebouncedAction(hid::Action::Menu))
       return false;
 
@@ -446,30 +456,32 @@ std::pair<RunResult, std::optional<size_t>> SplashScreen::run(const gsl::not_nul
     gsl_Assert(mesh != nullptr);
 
     mesh->getRenderState().setViewport(presenter.getDisplayViewport());
-    presenter.withBackbuffer(
-      [&mesh]()
+    presenter.inBackbuffer(
+      [&mesh]
       {
         render::scene::RenderContext context{
           render::material::RenderMode::FullOpaque, std::nullopt, render::scene::Translucency::Opaque};
         mesh->render(nullptr, context);
       });
-    presenter.updateSoundEngine();
+    if(throttler.isTimeForLogic())
+    {
+      presenter.updateSoundEngine();
+    }
     presenter.swapBuffers();
 
-    throttler.wait();
     return true;
   };
 
   for(const auto end = std::chrono::high_resolution_clock::now() + std::chrono::seconds{m_fadeInDurationSeconds};
       std::chrono::high_resolution_clock::now() < end;)
   {
-    const auto time = gsl::narrow_cast<float>(
+    const auto time = gsl_lite::narrow_cast<float>(
       std::chrono::duration_cast<std::chrono::milliseconds>(end - std::chrono::high_resolution_clock::now()).count());
-    const auto duration = gsl::narrow_cast<float>(
+    const auto duration = gsl_lite::narrow_cast<float>(
       std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::seconds{m_fadeInDurationSeconds}).count());
     alpha = std::clamp(1 - time / duration, 0.0f, 1.0f);
     if(!renderFrame())
-      return {RunResult::NextLevel, std::nullopt};
+      return {LevelLoopResult::NextLevel, std::nullopt};
   }
 
   alpha = 1;
@@ -478,22 +490,22 @@ std::pair<RunResult, std::optional<size_t>> SplashScreen::run(const gsl::not_nul
       std::chrono::high_resolution_clock::now() < end;)
   {
     if(!renderFrame())
-      return {RunResult::NextLevel, std::nullopt};
+      return {LevelLoopResult::NextLevel, std::nullopt};
   }
 
   for(const auto end = std::chrono::high_resolution_clock::now() + std::chrono::seconds{m_fadeOutDurationSeconds};
       std::chrono::high_resolution_clock::now() < end;)
   {
-    const auto time = gsl::narrow_cast<float>(
+    const auto time = gsl_lite::narrow_cast<float>(
       std::chrono::duration_cast<std::chrono::milliseconds>(end - std::chrono::high_resolution_clock::now()).count());
-    const auto duration = gsl::narrow_cast<float>(
+    const auto duration = gsl_lite::narrow_cast<float>(
       std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::seconds{m_fadeOutDurationSeconds}).count());
     alpha = std::clamp(time / duration, 0.0f, 1.0f);
     if(!renderFrame())
-      return {RunResult::NextLevel, std::nullopt};
+      return {LevelLoopResult::NextLevel, std::nullopt};
   }
 
-  return {RunResult::NextLevel, std::nullopt};
+  return {LevelLoopResult::NextLevel, std::nullopt};
 }
 
 std::vector<std::filesystem::path> SplashScreen::getFilepathsIfInvalid(const std::filesystem::path& dataRoot) const
@@ -503,21 +515,23 @@ std::vector<std::filesystem::path> SplashScreen::getFilepathsIfInvalid(const std
   return {std::filesystem::path{m_path}};
 }
 
-std::pair<RunResult, std::optional<size_t>> LevelSequenceItem::runFromSave(const gsl::not_null<Engine*>&,
-                                                                           const std::optional<size_t>&,
-                                                                           const std::shared_ptr<Player>&,
-                                                                           const std::shared_ptr<Player>&)
+std::pair<LevelLoopResult, std::optional<size_t>> LevelSequenceItem::runFromSave(const gsl_lite::not_null<Engine*>&,
+                                                                                 const std::optional<size_t>&,
+                                                                                 const std::shared_ptr<Player>&,
+                                                                                 const std::shared_ptr<Player>&)
 {
   BOOST_LOG_TRIVIAL(error) << "Cannot run from save";
   BOOST_THROW_EXCEPTION(std::runtime_error("Cannot run from save"));
 }
 
-std::pair<RunResult, std::optional<size_t>> ModifyInventory::run(const gsl::not_null<Engine*>& /*engine*/,
-                                                                 const std::shared_ptr<Player>& player,
-                                                                 const std::shared_ptr<Player>& /*levelStartPlayer*/)
+std::pair<LevelLoopResult, std::optional<size_t>>
+  ModifyInventory::run(const gsl_lite::not_null<Engine*>& /*engine*/,
+                       const std::shared_ptr<Player>& player,
+                       const std::shared_ptr<Player>& /*levelStartPlayer*/
+  )
 {
   apply(player);
-  return {RunResult::NextLevel, std::nullopt};
+  return {LevelLoopResult::NextLevel, std::nullopt};
 }
 
 void ModifyInventory::apply(const std::shared_ptr<Player>& player)
@@ -541,8 +555,8 @@ bool Gameflow::hasAllAmmoCheat() const
 std::vector<std::filesystem::path> Gameflow::getInvalidFilepaths(const std::filesystem::path& dataRoot) const
 {
   std::vector<std::filesystem::path> result;
-  for(const auto& track : m_tracks)
-    for(auto&& invalid : track.second->getFilepathsIfInvalid(dataRoot))
+  for(const auto& track : m_tracks | std::views::values)
+    for(auto&& invalid : track->getFilepathsIfInvalid(dataRoot))
       result.emplace_back(std::move(invalid));
   for(const auto& levelSequenceItem : m_levelSequence)
   {
@@ -605,11 +619,12 @@ std::filesystem::path TrackInfo::getFirstValidAlternative(const std::filesystem:
   BOOST_THROW_EXCEPTION(std::runtime_error("no valid alternative found"));
 }
 
-std::pair<RunResult, std::optional<size_t>> PlayAudioSlot::run(const gsl::not_null<Engine*>& engine,
-                                                               const std::shared_ptr<Player>& /*player*/,
-                                                               const std::shared_ptr<Player>& /*levelStartPlayer*/)
+std::pair<LevelLoopResult, std::optional<size_t>>
+  PlayAudioSlot::run(const gsl_lite::not_null<Engine*>& engine,
+                     const std::shared_ptr<Player>& /*player*/,
+                     const std::shared_ptr<Player>& /*levelStartPlayer*/)
 {
-  const gsl::not_null trackInfo{engine->getScriptEngine().getGameflow().getTracks().at(m_track)};
+  const gsl_lite::not_null trackInfo{engine->getScriptEngine().getGameflow().getTracks().at(m_track)};
   engine->getPresenter().getSoundEngine()->freeSlot(m_slot);
   const auto stream = engine->getPresenter().getSoundEngine()->createStream(
     trackInfo->getFirstValidAlternative(engine->getAssetDataPath()), std::chrono::milliseconds{0});
@@ -617,22 +632,24 @@ std::pair<RunResult, std::optional<size_t>> PlayAudioSlot::run(const gsl::not_nu
   engine->getPresenter().getSoundEngine()->setSlotStream(
     m_slot, stream, trackInfo->getFirstValidAlternative(engine->getAssetDataPath()));
   stream->play();
-  return {RunResult::NextLevel, std::nullopt};
+  return {LevelLoopResult::NextLevel, std::nullopt};
 }
 
-std::pair<RunResult, std::optional<size_t>> StopAudioSlot::run(const gsl::not_null<Engine*>& engine,
-                                                               const std::shared_ptr<Player>& /*player*/,
-                                                               const std::shared_ptr<Player>& /*levelStartPlayer*/)
+std::pair<LevelLoopResult, std::optional<size_t>>
+  StopAudioSlot::run(const gsl_lite::not_null<Engine*>& engine,
+                     const std::shared_ptr<Player>& /*player*/,
+                     const std::shared_ptr<Player>& /*levelStartPlayer*/)
 {
   engine->getPresenter().getSoundEngine()->freeSlot(m_slot);
-  return {RunResult::NextLevel, std::nullopt};
+  return {LevelLoopResult::NextLevel, std::nullopt};
 }
 
-std::pair<RunResult, std::optional<size_t>> ResetSoundEngine::run(const gsl::not_null<Engine*>& engine,
-                                                                  const std::shared_ptr<Player>& /*player*/,
-                                                                  const std::shared_ptr<Player>& /*levelStartPlayer*/)
+std::pair<LevelLoopResult, std::optional<size_t>> ResetSoundEngine::run(const gsl_lite::not_null<Engine*>& engine,
+                                                                        const std::shared_ptr<Player>& /*player*/,
+                                                                        const std::shared_ptr<Player>&
+                                                                        /*levelStartPlayer*/)
 {
   engine->getPresenter().getSoundEngine()->reset();
-  return {RunResult::NextLevel, std::nullopt};
+  return {LevelLoopResult::NextLevel, std::nullopt};
 }
-} // namespace engine::script
+} // namespace engine::script
\ No newline at end of file
diff --git a/src/engine/script/reflection.h b/src/engine/script/reflection.h
index 890b6b9e3..308b65b36 100644
--- a/src/engine/script/reflection.h
+++ b/src/engine/script/reflection.h
@@ -14,7 +14,7 @@
 #include <cstdint>
 #include <filesystem>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <map>
 #include <memory>
@@ -31,7 +31,7 @@
 
 namespace engine
 {
-enum class RunResult : uint8_t;
+enum class LevelLoopResult : uint8_t;
 enum class WeaponType : uint8_t;
 class Engine;
 class Player;
@@ -69,7 +69,7 @@ struct ObjectInfo
   }
 };
 
-struct PyObjectInfo : public ObjectInfo
+struct PyObjectInfo : ObjectInfo
 {
   void customize(const std::shared_ptr<objects::Object>& object) override
   {
@@ -80,7 +80,10 @@ struct PyObjectInfo : public ObjectInfo
 
 struct TrackInfo
 {
-  TrackInfo(const std::vector<std::string>& paths, size_t slot, bool looping, uint32_t fadeDurationSeconds)
+  TrackInfo(const std::vector<std::string>& paths,
+            const size_t slot,
+            const bool looping,
+            const uint32_t fadeDurationSeconds)
       : slot{slot}
       , looping{looping}
       , fadeDurationSeconds{fadeDurationSeconds}
@@ -105,14 +108,14 @@ class LevelSequenceItem
 {
 public:
   virtual ~LevelSequenceItem() = default;
-  virtual std::pair<RunResult, std::optional<size_t>> run(const gsl::not_null<Engine*>& engine,
-                                                          const std::shared_ptr<Player>& player,
-                                                          const std::shared_ptr<Player>& levelStartPlayer)
-    = 0;
-  virtual std::pair<RunResult, std::optional<size_t>> runFromSave(const gsl::not_null<Engine*>& /*engine*/,
-                                                                  const std::optional<size_t>& /*slot*/,
-                                                                  const std::shared_ptr<Player>& /*player*/,
-                                                                  const std::shared_ptr<Player>& /*levelStartPlayer*/);
+  virtual std::pair<LevelLoopResult, std::optional<size_t>> run(const gsl_lite::not_null<Engine*>& engine,
+                                                                const std::shared_ptr<Player>& player,
+                                                                const std::shared_ptr<Player>& levelStartPlayer) = 0;
+  virtual std::pair<LevelLoopResult, std::optional<size_t>> runFromSave(const gsl_lite::not_null<Engine*>& /*engine*/,
+                                                                        const std::optional<size_t>& /*slot*/,
+                                                                        const std::shared_ptr<Player>& /*player*/,
+                                                                        const std::shared_ptr<Player>&
+                                                                        /*levelStartPlayer*/);
 
   [[nodiscard]] virtual bool isLevel(const std::filesystem::path& path) const = 0;
   [[nodiscard]] virtual std::vector<std::filesystem::path>
@@ -121,7 +124,6 @@ class LevelSequenceItem
 
 class Level : public LevelSequenceItem
 {
-private:
   std::string m_name;
   bool m_useAlternativeLara;
   std::unordered_map<std::string, std::string> m_titles;
@@ -135,7 +137,7 @@ class Level : public LevelSequenceItem
   loader::file::level::Game m_game;
 
 protected:
-  [[nodiscard]] std::unique_ptr<world::World> loadWorld(const gsl::not_null<Engine*>& engine,
+  [[nodiscard]] std::unique_ptr<world::World> loadWorld(const gsl_lite::not_null<Engine*>& engine,
                                                         const std::shared_ptr<Player>& player,
                                                         const std::shared_ptr<Player>& levelStartPlayer,
                                                         bool fromSave);
@@ -145,16 +147,16 @@ class Level : public LevelSequenceItem
   static constexpr auto DefaultWaterColor = std::tuple{0.0f, 0.462f, 0.494f};
 
   explicit Level(std::string name,
-                 bool useAlternativeLara,
+                 const bool useAlternativeLara,
                  std::unordered_map<std::string, std::string> titles,
                  std::unordered_map<std::string, std::unordered_map<TR1ItemId, std::string>> itemTitles,
-                 std::optional<TR1TrackId> ambient,
-                 bool allowSave,
-                 WeaponType defaultWeapon,
+                 const std::optional<TR1TrackId> ambient,
+                 const bool allowSave,
+                 const WeaponType defaultWeapon,
                  std::tuple<float, float, float> waterColor,
-                 float waterDensity,
+                 const float waterDensity,
                  std::optional<std::string> alternativeSplashscreen,
-                 loader::file::level::Game game)
+                 const loader::file::level::Game game)
       : m_name{std::move(name)}
       , m_useAlternativeLara{useAlternativeLara}
       , m_titles{std::move(titles)}
@@ -169,13 +171,14 @@ class Level : public LevelSequenceItem
   {
   }
 
-  std::pair<RunResult, std::optional<size_t>> run(const gsl::not_null<Engine*>& engine,
-                                                  const std::shared_ptr<Player>& player,
-                                                  const std::shared_ptr<Player>& levelStartPlayer) override;
-  std::pair<RunResult, std::optional<size_t>> runFromSave(const gsl::not_null<Engine*>& engine,
-                                                          const std::optional<size_t>& slot,
-                                                          const std::shared_ptr<Player>& player,
-                                                          const std::shared_ptr<Player>& levelStartPlayer) override;
+  std::pair<LevelLoopResult, std::optional<size_t>> run(const gsl_lite::not_null<Engine*>& engine,
+                                                        const std::shared_ptr<Player>& player,
+                                                        const std::shared_ptr<Player>& levelStartPlayer) override;
+  std::pair<LevelLoopResult, std::optional<size_t>>
+    runFromSave(const gsl_lite::not_null<Engine*>& engine,
+                const std::optional<size_t>& slot,
+                const std::shared_ptr<Player>& player,
+                const std::shared_ptr<Player>& levelStartPlayer) override;
 
   [[nodiscard]] bool isLevel(const std::filesystem::path& path) const override;
 
@@ -183,6 +186,7 @@ class Level : public LevelSequenceItem
     getFilepathsIfInvalid(const std::filesystem::path& dataRoot) const override;
 
   [[nodiscard]] std::filesystem::path getFilepath() const;
+
   [[nodiscard]] const auto& getTitles() const noexcept
   {
     return m_titles;
@@ -191,7 +195,6 @@ class Level : public LevelSequenceItem
 
 class ModifyInventory : public LevelSequenceItem
 {
-private:
   std::unordered_map<TR1ItemId, size_t> m_addInventory;
   std::unordered_set<TR1ItemId> m_dropInventory;
 
@@ -205,9 +208,9 @@ class ModifyInventory : public LevelSequenceItem
 
   void apply(const std::shared_ptr<Player>& player);
 
-  std::pair<RunResult, std::optional<size_t>> run(const gsl::not_null<Engine*>& engine,
-                                                  const std::shared_ptr<Player>& player,
-                                                  const std::shared_ptr<Player>& levelStartPlayer) override;
+  std::pair<LevelLoopResult, std::optional<size_t>> run(const gsl_lite::not_null<Engine*>& engine,
+                                                        const std::shared_ptr<Player>& player,
+                                                        const std::shared_ptr<Player>& levelStartPlayer) override;
 
   [[nodiscard]] bool isLevel(const std::filesystem::path& /*path*/) const override
   {
@@ -231,9 +234,9 @@ class TitleMenu : public Level
             std::optional<TR1TrackId> ambient,
             loader::file::level::Game game);
 
-  std::pair<RunResult, std::optional<size_t>> run(const gsl::not_null<Engine*>& engine,
-                                                  const std::shared_ptr<Player>& player,
-                                                  const std::shared_ptr<Player>& levelStartPlayer) override;
+  std::pair<LevelLoopResult, std::optional<size_t>> run(const gsl_lite::not_null<Engine*>& engine,
+                                                        const std::shared_ptr<Player>& player,
+                                                        const std::shared_ptr<Player>& levelStartPlayer) override;
 
   [[nodiscard]] bool isLevel(const std::filesystem::path& /*path*/) const override
   {
@@ -243,23 +246,22 @@ class TitleMenu : public Level
 
 class Video : public LevelSequenceItem
 {
-private:
   std::vector<std::filesystem::path> m_paths;
   bool m_optional;
 
 public:
-  explicit Video(const std::vector<std::string>& paths, bool optional)
+  explicit Video(const std::vector<std::string>& paths, const bool optional)
       : m_optional{optional}
   {
     if(paths.empty())
       BOOST_THROW_EXCEPTION(std::invalid_argument("paths is empty"));
 
-    std::copy(paths.begin(), paths.end(), std::back_inserter(m_paths));
+    std::ranges::copy(paths, std::back_inserter(m_paths));
   }
 
-  std::pair<RunResult, std::optional<size_t>> run(const gsl::not_null<Engine*>& engine,
-                                                  const std::shared_ptr<Player>& player,
-                                                  const std::shared_ptr<Player>& levelStartPlayer) override;
+  std::pair<LevelLoopResult, std::optional<size_t>> run(const gsl_lite::not_null<Engine*>& engine,
+                                                        const std::shared_ptr<Player>& player,
+                                                        const std::shared_ptr<Player>& levelStartPlayer) override;
 
   [[nodiscard]] bool isLevel(const std::filesystem::path& /*path*/) const override
   {
@@ -272,7 +274,6 @@ class Video : public LevelSequenceItem
 
 class Cutscene : public LevelSequenceItem
 {
-private:
   std::string m_name;
   TR1TrackId m_track;
   bool m_flipRooms;
@@ -284,18 +285,18 @@ class Cutscene : public LevelSequenceItem
 
 public:
   explicit Cutscene(std::string name,
-                    TR1TrackId track,
-                    bool flipRooms,
-                    bool weaponSwap,
-                    float cameraRot,
+                    const TR1TrackId track,
+                    const bool flipRooms,
+                    const bool weaponSwap,
+                    const float cameraRot,
                     int cameraPosX,
                     int cameraPosZ,
-                    loader::file::level::Game game) noexcept
+                    const loader::file::level::Game game) noexcept
       : m_name{std::move(name)}
       , m_track{track}
       , m_flipRooms{flipRooms}
       , m_weaponSwap{weaponSwap}
-      , m_cameraRot{core::angleFromDegrees(cameraRot)}
+      , m_cameraRot{core::toAngle(core::Degrees{cameraRot})}
       , m_cameraPosX{cameraPosX}
       , m_cameraPosZ{cameraPosZ}
       , m_game{game}
@@ -303,25 +304,25 @@ class Cutscene : public LevelSequenceItem
   }
 
   explicit Cutscene(std::string name,
-                    TR1TrackId track,
-                    bool flipRooms,
-                    bool weaponSwap,
-                    float cameraRot,
-                    loader::file::level::Game game) noexcept
+                    const TR1TrackId track,
+                    const bool flipRooms,
+                    const bool weaponSwap,
+                    const float cameraRot,
+                    const loader::file::level::Game game) noexcept
       : m_name{std::move(name)}
       , m_track{track}
       , m_flipRooms{flipRooms}
       , m_weaponSwap{weaponSwap}
-      , m_cameraRot{core::angleFromDegrees(cameraRot)}
+      , m_cameraRot{core::toAngle(core::Degrees{cameraRot})}
       , m_cameraPosX{std::nullopt}
       , m_cameraPosZ{std::nullopt}
       , m_game{game}
   {
   }
 
-  std::pair<RunResult, std::optional<size_t>> run(const gsl::not_null<Engine*>& engine,
-                                                  const std::shared_ptr<Player>& player,
-                                                  const std::shared_ptr<Player>& levelStartPlayer) override;
+  std::pair<LevelLoopResult, std::optional<size_t>> run(const gsl_lite::not_null<Engine*>& engine,
+                                                        const std::shared_ptr<Player>& player,
+                                                        const std::shared_ptr<Player>& levelStartPlayer) override;
 
   [[nodiscard]] bool isLevel(const std::filesystem::path& /*path*/) const override
   {
@@ -334,7 +335,6 @@ class Cutscene : public LevelSequenceItem
 
 class SplashScreen : public LevelSequenceItem
 {
-private:
   std::filesystem::path m_path;
   int m_durationSeconds;
   int m_fadeInDurationSeconds;
@@ -345,9 +345,9 @@ class SplashScreen : public LevelSequenceItem
 
   ~SplashScreen() override;
 
-  std::pair<RunResult, std::optional<size_t>> run(const gsl::not_null<Engine*>& engine,
-                                                  const std::shared_ptr<Player>& player,
-                                                  const std::shared_ptr<Player>& levelStartPlayer) override;
+  std::pair<LevelLoopResult, std::optional<size_t>> run(const gsl_lite::not_null<Engine*>& engine,
+                                                        const std::shared_ptr<Player>& player,
+                                                        const std::shared_ptr<Player>& levelStartPlayer) override;
 
   [[nodiscard]] bool isLevel(const std::filesystem::path& /*path*/) const override
   {
@@ -360,12 +360,11 @@ class SplashScreen : public LevelSequenceItem
 
 class PlayAudioSlot : public LevelSequenceItem
 {
-private:
   size_t m_slot;
   TR1TrackId m_track;
 
 public:
-  explicit PlayAudioSlot(size_t slot, TR1TrackId track) noexcept
+  explicit PlayAudioSlot(const size_t slot, const TR1TrackId track) noexcept
       : m_slot{slot}
       , m_track{track}
   {
@@ -373,9 +372,9 @@ class PlayAudioSlot : public LevelSequenceItem
 
   ~PlayAudioSlot() override = default;
 
-  std::pair<RunResult, std::optional<size_t>> run(const gsl::not_null<Engine*>& engine,
-                                                  const std::shared_ptr<Player>& player,
-                                                  const std::shared_ptr<Player>& levelStartPlayer) override;
+  std::pair<LevelLoopResult, std::optional<size_t>> run(const gsl_lite::not_null<Engine*>& engine,
+                                                        const std::shared_ptr<Player>& player,
+                                                        const std::shared_ptr<Player>& levelStartPlayer) override;
 
   [[nodiscard]] bool isLevel(const std::filesystem::path& /*path*/) const override
   {
@@ -391,20 +390,19 @@ class PlayAudioSlot : public LevelSequenceItem
 
 class StopAudioSlot : public LevelSequenceItem
 {
-private:
   size_t m_slot;
 
 public:
-  explicit StopAudioSlot(size_t slot) noexcept
+  explicit StopAudioSlot(const size_t slot) noexcept
       : m_slot{slot}
   {
   }
 
   ~StopAudioSlot() override = default;
 
-  std::pair<RunResult, std::optional<size_t>> run(const gsl::not_null<Engine*>& engine,
-                                                  const std::shared_ptr<Player>& player,
-                                                  const std::shared_ptr<Player>& levelStartPlayer) override;
+  std::pair<LevelLoopResult, std::optional<size_t>> run(const gsl_lite::not_null<Engine*>& engine,
+                                                        const std::shared_ptr<Player>& player,
+                                                        const std::shared_ptr<Player>& levelStartPlayer) override;
 
   [[nodiscard]] bool isLevel(const std::filesystem::path& /*path*/) const override
   {
@@ -425,9 +423,9 @@ class ResetSoundEngine : public LevelSequenceItem
 
   ~ResetSoundEngine() override = default;
 
-  std::pair<RunResult, std::optional<size_t>> run(const gsl::not_null<Engine*>& engine,
-                                                  const std::shared_ptr<Player>& player,
-                                                  const std::shared_ptr<Player>& levelStartPlayer) override;
+  std::pair<LevelLoopResult, std::optional<size_t>> run(const gsl_lite::not_null<Engine*>& engine,
+                                                        const std::shared_ptr<Player>& player,
+                                                        const std::shared_ptr<Player>& levelStartPlayer) override;
 
   [[nodiscard]] bool isLevel(const std::filesystem::path& /*path*/) const override
   {
@@ -524,4 +522,4 @@ class Gameflow final
   pybind11::dict m_cheats;
   std::string m_assetRoot;
 };
-} // namespace engine::script
+} // namespace engine::script
\ No newline at end of file
diff --git a/src/engine/script/scriptengine.cpp b/src/engine/script/scriptengine.cpp
index 0c9d9abe0..37ac56d07 100644
--- a/src/engine/script/scriptengine.cpp
+++ b/src/engine/script/scriptengine.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/log/trivial.hpp>
 #include <boost/throw_exception.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <pybind11/embed.h>
 #include <pybind11/stl.h> // IWYU pragma: keep
 
@@ -58,6 +58,6 @@ ScriptEngine::ScriptEngine(const std::filesystem::path& rootPath)
 // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
 const Gameflow& ScriptEngine::getGameflow() const
 {
-  return *gsl::not_null{pybind11::globals()["gameflow"].cast<Gameflow*>()};
+  return *gsl_lite::not_null{pybind11::globals()["gameflow"].cast<Gameflow*>()};
 }
-} // namespace engine::script
+} // namespace engine::script
\ No newline at end of file
diff --git a/src/engine/skeletalmodelnode.cpp b/src/engine/skeletalmodelnode.cpp
index 23b773b5e..e83a04119 100644
--- a/src/engine/skeletalmodelnode.cpp
+++ b/src/engine/skeletalmodelnode.cpp
@@ -10,6 +10,7 @@
 #include "objects/objectstate.h"
 #include "presenter.h"
 #include "qs/qs.h"
+#include "render/material/materialmanager.h"
 #include "render/scene/mesh.h" // IWYU pragma: keep
 #include "serialization/glm.h"
 #include "serialization/not_null.h"
@@ -37,7 +38,7 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/mat4x4.hpp>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <memory>
 #include <optional>
@@ -48,10 +49,37 @@
 
 namespace engine
 {
+namespace
+{
+std::optional<const world::TransitionCase>
+  findTransition(const world::Animation& anim, const core::Frame frame, const core::AnimStateId goal)
+{
+  if(anim.state_id == goal)
+    return std::nullopt;
+
+  for(const world::Transitions& tr : anim.transitions)
+  {
+    if(tr.stateId != goal)
+      continue;
+
+    const auto it = std::ranges::find_if(tr.transitionCases,
+                                         [frame](const world::TransitionCase& trc)
+                                         {
+                                           return frame >= trc.firstFrame && frame <= trc.lastFrame;
+                                         });
+
+    if(it != tr.transitionCases.cend())
+      return *it;
+  }
+
+  return std::nullopt;
+}
+} // namespace
+
 SkeletalModelNode::SkeletalModelNode(const std::string& id,
-                                     gsl::not_null<const world::World*> world,
-                                     gsl::not_null<const world::SkeletalModelType*> model,
-                                     bool shadowCaster)
+                                     gsl_lite::not_null<world::World*> world,
+                                     gsl_lite::not_null<const world::SkeletalModelType*> model,
+                                     const bool shadowCaster)
     : Node{id}
     , m_world{std::move(world)}
     , m_model{std::move(model)}
@@ -63,55 +91,73 @@ core::Speed SkeletalModelNode::calculateFloorSpeed() const
 {
   const auto scaled = m_anim->speed + m_anim->acceleration * getLocalFrame();
   // NOLINTNEXTLINE(hicpp-signed-bitwise)
-  return scaled / gsl::narrow_cast<core::Speed::type>(1 << 16);
+  return scaled / gsl_lite::narrow_cast<core::Speed::type>(1 << 16);
 }
 
 core::Acceleration SkeletalModelNode::getAcceleration() const noexcept
 {
   const auto scaled = m_anim->acceleration;
   // NOLINTNEXTLINE(hicpp-signed-bitwise)
-  return scaled / gsl::narrow_cast<core::Acceleration::type>(1 << 16);
+  return scaled / gsl_lite::narrow_cast<core::Acceleration::type>(1 << 16);
 }
 
-InterpolationInfo SkeletalModelNode::getInterpolationInfo() const
+AnimSegmentInterpolationInfo SkeletalModelNode::getInterpolationInfo(const world::Animation& anim,
+                                                                     core::Frame frame) const
 {
-  gsl_Expects(m_anim != nullptr);
+  gsl_Expects(frame >= anim.firstFrame && frame <= anim.lastFrame);
 
-  gsl_Expects(m_frame >= m_anim->firstFrame && m_frame <= m_anim->lastFrame);
-  const auto firstLocalKeyframeIndex = getLocalFrame() / m_anim->segmentLength;
+  const auto localFrame = frame - anim.firstFrame;
+  const auto firstLocalKeyframeIndex = localFrame / anim.segmentLength;
 
-  const auto firstKeyframe = m_anim->frames->next(firstLocalKeyframeIndex);
+  const auto firstKeyframe = anim.frames->next(firstLocalKeyframeIndex);
   gsl_Assert(m_world->getWorldGeometry().isValid(firstKeyframe));
 
-  const auto segmentDuration = m_anim->segmentLength;
-  const auto segmentFrame = getLocalFrame() % m_anim->segmentLength;
+  const auto segmentFrame = localFrame % anim.segmentLength;
   if(segmentFrame == 0_frame)
   {
-    return InterpolationInfo{firstKeyframe, firstKeyframe, 0.0f};
+    return AnimSegmentInterpolationInfo{firstKeyframe, firstKeyframe, 0.0f};
   }
 
-  const auto bias = segmentFrame.cast<float>() / segmentDuration.cast<float>();
-  BOOST_ASSERT(bias >= 0 && bias <= 1);
+  const auto interKeyframeFactor = segmentFrame.cast<float>() / anim.segmentLength.cast<float>();
+  BOOST_ASSERT(interKeyframeFactor >= 0 && interKeyframeFactor <= 1);
 
   const auto secondKeyframe = firstKeyframe->next();
   gsl_Assert(m_world->getWorldGeometry().isValid(secondKeyframe));
-  return InterpolationInfo{firstKeyframe, secondKeyframe, bias};
+  return AnimSegmentInterpolationInfo{firstKeyframe, secondKeyframe, interKeyframeFactor};
+}
+
+AnimSegmentInterpolationInfo SkeletalModelNode::getInterpolationInfo() const
+{
+  return getInterpolationInfo(*m_anim, m_frame);
 }
 
-void SkeletalModelNode::updatePose()
+AnimSegmentInterpolationInfo SkeletalModelNode::getNextInterpolationInfo() const
+{
+  if(m_frame == m_anim->lastFrame)
+  {
+    return getInterpolationInfo(*m_anim->nextAnimation, m_anim->nextFrame);
+  }
+  else
+  {
+    return getInterpolationInfo(*m_anim, std::min(m_frame + 1_frame, m_anim->lastFrame));
+  }
+}
+
+void SkeletalModelNode::updateLogicPose(bool predictive)
 {
   if(m_meshParts.empty())
     return;
 
   BOOST_ASSERT(m_meshParts.size() >= m_model->bones.size());
 
-  updatePose(getInterpolationInfo());
+  calculatePoseMatrices(getInterpolationInfo(), &MeshPart::poseMatrix);
+  calculatePoseMatrices(predictive ? getNextInterpolationInfo() : getInterpolationInfo(), &MeshPart::nextPoseMatrix);
 }
 
-void SkeletalModelNode::updatePose(const InterpolationInfo& framePair)
+void SkeletalModelNode::calculatePoseMatrices(const AnimSegmentInterpolationInfo& framePair,
+                                              glm::mat4 MeshPart::* targetMatrix)
 {
   BOOST_ASSERT(!m_model->bones.empty());
-
   BOOST_ASSERT(framePair.firstFrame->numValues > 0);
   BOOST_ASSERT(framePair.secondFrame->numValues > 0);
 
@@ -125,7 +171,8 @@ void SkeletalModelNode::updatePose(const InterpolationInfo& framePair)
   transformsSecond.push(translate(glm::mat4{1.0f}, framePair.secondFrame->pos.toGl())
                         * core::fromPackedAngles(angleDataSecond.data()) * m_meshParts[0].patch);
 
-  m_meshParts[0].poseMatrix = util::mix(transformsFirst.top(), transformsSecond.top(), framePair.bias);
+  m_meshParts[0].*targetMatrix
+    = util::lerp(transformsFirst.top(), transformsSecond.top(), framePair.interKeyframeFactor);
 
   if(m_model->bones.size() <= 1)
     return;
@@ -139,8 +186,8 @@ void SkeletalModelNode::updatePose(const InterpolationInfo& framePair)
     }
     if(m_model->bones[i].pushMatrix)
     {
-      transformsFirst.push({transformsFirst.top()});   // make sure to have a copy, not a reference
-      transformsSecond.push({transformsSecond.top()}); // make sure to have a copy, not a reference
+      transformsFirst.push({transformsFirst.top()});
+      transformsSecond.push({transformsSecond.top()});
     }
 
     if(framePair.firstFrame->numValues < i)
@@ -155,48 +202,35 @@ void SkeletalModelNode::updatePose(const InterpolationInfo& framePair)
       transformsSecond.top() *= translate(glm::mat4{1.0f}, m_model->bones[i].position)
                                 * core::fromPackedAngles(&angleDataSecond[sizeof(uint32_t) * i]) * m_meshParts[i].patch;
 
-    m_meshParts[i].poseMatrix = util::mix(transformsFirst.top(), transformsSecond.top(), framePair.bias);
+    m_meshParts[i].*targetMatrix
+      = util::lerp(transformsFirst.top(), transformsSecond.top(), framePair.interKeyframeFactor);
   }
 }
 
 core::BoundingBox SkeletalModelNode::getBoundingBox() const
 {
   const auto framePair = getInterpolationInfo();
-  BOOST_ASSERT(framePair.bias >= 0 && framePair.bias <= 1);
+  BOOST_ASSERT(framePair.interKeyframeFactor >= 0 && framePair.interKeyframeFactor <= 1);
 
-  return core::BoundingBox{framePair.firstFrame->bbox.toBBox(), framePair.secondFrame->bbox.toBBox(), framePair.bias};
+  return core::BoundingBox{
+    framePair.firstFrame->bbox.toBBox(), framePair.secondFrame->bbox.toBBox(), framePair.interKeyframeFactor};
 }
 
 bool SkeletalModelNode::handleStateTransitions(core::AnimStateId& animState, const core::AnimStateId& goal)
 {
   gsl_Expects(m_anim != nullptr);
-  if(m_anim->state_id == goal)
-    return false;
 
-  for(const world::Transitions& tr : m_anim->transitions)
+  if(const auto transition = findTransition(*m_anim, m_frame, goal))
   {
-    if(tr.stateId != goal)
-      continue;
-
-    const auto it = std::find_if(tr.transitionCases.cbegin(),
-                                 tr.transitionCases.cend(),
-                                 [this](const world::TransitionCase& trc)
-                                 {
-                                   return m_frame >= trc.firstFrame && m_frame <= trc.lastFrame;
-                                 });
-
-    if(it != tr.transitionCases.cend())
-    {
-      setAnimation(animState, gsl::not_null{it->targetAnimation}, it->targetFrame);
-      return true;
-    }
+    setAnimation(animState, gsl_lite::not_null{transition->targetAnimation}, transition->targetFrame);
+    return true;
   }
 
   return false;
 }
 
 void SkeletalModelNode::setAnimation(core::AnimStateId& animState,
-                                     const gsl::not_null<const world::Animation*>& animation,
+                                     const gsl_lite::not_null<const world::Animation*>& animation,
                                      core::Frame frame)
 {
   BOOST_ASSERT(m_model->bones.empty() || animation->frames->numValues == m_model->bones.size());
@@ -224,7 +258,7 @@ bool SkeletalModelNode::advanceFrame(objects::ObjectState& state)
 
 std::vector<SkeletalModelNode::Sphere> SkeletalModelNode::getBoneCollisionSpheres()
 {
-  updatePose();
+  updateLogicPose(true);
   gsl_Expects(m_meshParts.size() == m_model->bones.size());
   std::vector<Sphere> result;
   result.reserve(m_meshParts.size());
@@ -261,7 +295,7 @@ void SkeletalModelNode::deserialize(const serialization::Deserializer<world::Wor
   {
     m_forceMeshRebuild = true;
     rebuildMesh();
-    updatePose();
+    updateLogicPose(true);
   };
 }
 
@@ -277,7 +311,7 @@ void deserialize(std::shared_ptr<SkeletalModelNode>& data, const serialization::
   bool shadowCaster;
   ser(S_NV("model", model), S_NV("shadowCaster", shadowCaster));
   data = std::make_shared<SkeletalModelNode>(
-    create(serialization::TypeId<std::string>{}, ser["id"]), ser.context, gsl::not_null{model}, shadowCaster);
+    create(serialization::TypeId<std::string>{}, ser["id"]), ser.context, gsl_lite::not_null{model}, shadowCaster);
   data->deserialize(ser);
 }
 
@@ -287,7 +321,7 @@ void SkeletalModelNode::buildMesh(const std::shared_ptr<SkeletalModelNode>& skel
     return;
 
   skeleton->setAnimation(
-    animState, gsl::not_null{&skeleton->m_model->animations[0]}, skeleton->m_model->animations->firstFrame);
+    animState, gsl_lite::not_null{&skeleton->m_model->animations[0]}, skeleton->m_model->animations->firstFrame);
   for(const auto& bone : skeleton->m_model->bones)
   {
     skeleton->m_meshParts.emplace_back(bone.mesh.get());
@@ -295,18 +329,17 @@ void SkeletalModelNode::buildMesh(const std::shared_ptr<SkeletalModelNode>& skel
 
   skeleton->m_forceMeshRebuild = true;
   skeleton->rebuildMesh();
-  skeleton->updatePose();
+  skeleton->updateLogicPose(true);
 }
 
 void SkeletalModelNode::rebuildMesh()
 {
   if(!m_forceMeshRebuild
-     && !std::any_of(m_meshParts.begin(),
-                     m_meshParts.end(),
-                     [](const auto& part)
-                     {
-                       return part.meshChanged();
-                     }))
+     && !std::ranges::any_of(m_meshParts,
+                             [](const auto& part)
+                             {
+                               return part.meshChanged();
+                             }))
   {
     return;
   }
@@ -330,14 +363,14 @@ void SkeletalModelNode::rebuildMesh()
     setRenderable(nullptr);
   else
     setRenderable(compositor.toMesh(
-      *m_world->getPresenter().getMaterialManager(),
+      m_world->getEngine().getPresenter().getRenderSystem().getMaterialManager(),
       true,
       m_shadowCaster,
-      [&engine = m_world->getEngine()]()
+      [&engine = m_world->getEngine()]
       {
         return engine.getEngineConfig()->animSmoothing;
       },
-      [&engine = m_world->getEngine()]()
+      [&engine = m_world->getEngine()]
       {
         const auto& settings = engine.getEngineConfig()->renderSettings;
         return !settings.lightingModeActive ? 0 : settings.lightingMode;
@@ -367,7 +400,7 @@ bool SkeletalModelNode::canBeCulled(const glm::mat4& viewProjection) const
   return min.x > 1 || min.y > 1 || max.x < -1 || max.y < -1;
 }
 
-void SkeletalModelNode::setAnim(const gsl::not_null<const world::Animation*>& anim,
+void SkeletalModelNode::setAnim(const gsl_lite::not_null<const world::Animation*>& anim,
                                 const std::optional<core::Frame>& frame)
 {
   m_anim = anim;
@@ -379,7 +412,8 @@ core::Frame SkeletalModelNode::getLocalFrame() const noexcept
   return m_frame - m_anim->firstFrame;
 }
 
-void SkeletalModelNode::replaceAnim(const gsl::not_null<const world::Animation*>& anim, const core::Frame& localFrame)
+void SkeletalModelNode::replaceAnim(const gsl_lite::not_null<const world::Animation*>& anim,
+                                    const core::Frame& localFrame)
 {
   setAnim(anim, anim->firstFrame + localFrame);
 }
@@ -387,26 +421,13 @@ void SkeletalModelNode::replaceAnim(const gsl::not_null<const world::Animation*>
 const gl::ShaderStorageBuffer<glm::mat4>&
   SkeletalModelNode::getMeshMatricesBuffer(const std::function<bool()>& smooth) const
 {
-  if(smooth())
-  {
-    for(auto& part : m_meshParts)
-    {
-      static constexpr float Smoothing = 0.2f;
-      if(!part.poseMatrixSmooth.has_value())
-        part.poseMatrixSmooth = part.poseMatrix;
-      else
-        part.poseMatrixSmooth = Smoothing * *part.poseMatrixSmooth + (1 - Smoothing) * part.poseMatrix;
-    }
-  }
-
   std::vector<glm::mat4> matrices;
-  std::transform(m_meshParts.begin(),
-                 m_meshParts.end(),
-                 std::back_inserter(matrices),
-                 [smooth](const auto& part)
-                 {
-                   return smooth() ? *part.poseMatrixSmooth : part.poseMatrix;
-                 });
+  std::ranges::transform(m_meshParts,
+                         std::back_inserter(matrices),
+                         [smooth](const auto& part)
+                         {
+                           return smooth() ? part.poseMatrixSmooth.value_or(part.poseMatrix) : part.poseMatrix;
+                         });
 
   if(m_meshMatricesBuffer == nullptr || m_meshMatricesBuffer->size() != matrices.size())
   {
@@ -421,6 +442,52 @@ const gl::ShaderStorageBuffer<glm::mat4>&
   return *m_meshMatricesBuffer;
 }
 
+const gl::ShaderStorageBuffer<glm::mat4>&
+  SkeletalModelNode::getNextMeshMatricesBuffer(const std::function<bool()>& smooth) const
+{
+  std::vector<glm::mat4> matrices;
+  std::ranges::transform(m_meshParts,
+                         std::back_inserter(matrices),
+                         [smooth](const auto& part)
+                         {
+                           return smooth() ? part.nextPoseMatrixSmooth.value_or(part.nextPoseMatrix)
+                                           : part.nextPoseMatrix;
+                         });
+
+  if(m_nextMeshMatricesBuffer == nullptr || m_nextMeshMatricesBuffer->size() != matrices.size())
+  {
+    m_nextMeshMatricesBuffer = std::make_unique<gl::ShaderStorageBuffer<glm::mat4>>(
+      "next-mesh-matrices-ssb", gl::api::BufferUsage::DynamicDraw, matrices);
+  }
+  else
+  {
+    m_nextMeshMatricesBuffer->setSubData(matrices, 0);
+  }
+
+  return *m_nextMeshMatricesBuffer;
+}
+
+void SkeletalModelNode::updateSmoothMatrices()
+{
+  for(auto& part : m_meshParts)
+  {
+    part.updateSmoothMatrices();
+  }
+}
+
+void SkeletalModelNode::MeshPart::updateSmoothMatrices()
+{
+  static constexpr float Smoothing = 0.2f;
+  if(!poseMatrixSmooth.has_value())
+    poseMatrixSmooth = poseMatrix;
+  else
+    poseMatrixSmooth = Smoothing * *poseMatrixSmooth + (1 - Smoothing) * poseMatrix;
+  if(!nextPoseMatrixSmooth.has_value())
+    nextPoseMatrixSmooth = nextPoseMatrix;
+  else
+    nextPoseMatrixSmooth = Smoothing * *nextPoseMatrixSmooth + (1 - Smoothing) * nextPoseMatrix;
+}
+
 void SkeletalModelNode::MeshPart::serialize(const serialization::Serializer<world::World>& ser) const
 {
   ser(S_NV("patch", patch), S_NV("poseMatrix", poseMatrix), S_NV("mesh", mesh), S_NV("visible", visible));
@@ -437,4 +504,4 @@ SkeletalModelNode::MeshPart SkeletalModelNode::MeshPart::create(const serializat
   tmp.deserialize(ser);
   return tmp;
 }
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/skeletalmodelnode.h b/src/engine/skeletalmodelnode.h
index 5180f5b49..b4a3cea40 100644
--- a/src/engine/skeletalmodelnode.h
+++ b/src/engine/skeletalmodelnode.h
@@ -13,7 +13,7 @@
 #include <glm/fwd.hpp>
 #include <glm/mat4x4.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 #include <string>
@@ -45,15 +45,16 @@ struct ObjectState;
 
 namespace engine
 {
-struct InterpolationInfo
+struct AnimSegmentInterpolationInfo
 {
-  gsl::not_null<const loader::file::AnimFrame*> firstFrame;
-  gsl::not_null<const loader::file::AnimFrame*> secondFrame;
-  float bias;
+  // Animations can span multiple logic ticks (not strictly 30fps - keyframes may be several ticks apart).
+  gsl_lite::not_null<const loader::file::AnimFrame*> firstFrame;
+  gsl_lite::not_null<const loader::file::AnimFrame*> secondFrame;
+  float interKeyframeFactor;
 
   [[nodiscard]] const auto& getNearestFrame() const noexcept
   {
-    if(bias <= 0.5f)
+    if(interKeyframeFactor <= 0.5f)
     {
       return firstFrame;
     }
@@ -64,18 +65,18 @@ struct InterpolationInfo
   }
 };
 
-class SkeletalModelNode : public render::scene::Node
+class SkeletalModelNode final : public render::scene::Node
 {
 public:
   explicit SkeletalModelNode(const std::string& id,
-                             gsl::not_null<const world::World*> world,
-                             gsl::not_null<const world::SkeletalModelType*> model,
+                             gsl_lite::not_null<world::World*> world,
+                             gsl_lite::not_null<const world::SkeletalModelType*> model,
                              bool shadowCaster);
 
-  void updatePose();
+  void updateLogicPose(bool predictive);
 
   void setAnimation(core::AnimStateId& animState,
-                    const gsl::not_null<const world::Animation*>& animation,
+                    const gsl_lite::not_null<const world::Animation*>& animation,
                     core::Frame frame);
 
   [[nodiscard]] core::Speed calculateFloorSpeed() const;
@@ -90,7 +91,8 @@ class SkeletalModelNode : public render::scene::Node
 
   [[nodiscard]] bool advanceFrame(objects::ObjectState& state);
 
-  InterpolationInfo getInterpolationInfo() const;
+  [[nodiscard]] AnimSegmentInterpolationInfo getInterpolationInfo() const;
+  [[nodiscard]] AnimSegmentInterpolationInfo getNextInterpolationInfo() const;
 
   struct Sphere
   {
@@ -122,8 +124,8 @@ class SkeletalModelNode : public render::scene::Node
   };
 
   /**
-   * Bone collision spheres in world space.
-   */
+* Bone collision spheres in world space.
+*/
   [[nodiscard]] std::vector<Sphere> getBoneCollisionSpheres();
 
   void serialize(const serialization::Serializer<world::World>& ser) const;
@@ -135,22 +137,22 @@ class SkeletalModelNode : public render::scene::Node
 
   [[nodiscard]] bool canBeCulled(const glm::mat4& viewProjection) const override;
 
-  void setMesh(size_t idx, const std::shared_ptr<world::RenderMeshData>& mesh)
+  void setMesh(const size_t idx, const std::shared_ptr<world::RenderMeshData>& mesh)
   {
     m_meshParts.at(idx).mesh = mesh;
   }
 
-  [[nodiscard]] const auto& getMesh(size_t idx) const
+  [[nodiscard]] const auto& getMesh(const size_t idx) const
   {
     return m_meshParts.at(idx).mesh;
   }
 
-  [[nodiscard]] const auto& getCurrentMesh(size_t idx) const
+  [[nodiscard]] const auto& getCurrentMesh(const size_t idx) const
   {
     return m_meshParts.at(idx).currentMesh;
   }
 
-  [[nodiscard]] glm::vec3 getMeshPartTranslationWorld(size_t idx) const
+  [[nodiscard]] glm::vec3 getMeshPartTranslationWorld(const size_t idx) const
   {
     auto m = getModelMatrix() * m_meshParts.at(idx).poseMatrix;
     return glm::vec3{m[3]};
@@ -161,27 +163,33 @@ class SkeletalModelNode : public render::scene::Node
     return m_meshParts.size();
   }
 
-  void setPoseMatrix(size_t idx, const glm::mat4& m)
+  void setPoseMatrix(const size_t idx, const glm::mat4& m, const glm::mat4& next)
   {
     m_meshParts.at(idx).poseMatrix = m;
+    m_meshParts.at(idx).nextPoseMatrix = next;
   }
 
-  [[nodiscard]] const auto& getPoseMatrix(size_t idx) const
+  [[nodiscard]] const auto& getPoseMatrix(const size_t idx) const
   {
     return m_meshParts.at(idx).poseMatrix;
   }
 
-  void setReflective(size_t idx, const gl::SRGBA8& reflective)
+  [[nodiscard]] const auto& getNextPoseMatrix(const size_t idx) const
+  {
+    return m_meshParts.at(idx).nextPoseMatrix;
+  }
+
+  void setReflective(const size_t idx, const gl::SRGBA8& reflective)
   {
     m_meshParts.at(idx).reflective = reflective;
   }
 
-  void setVisible(size_t idx, bool visible)
+  void setVisible(const size_t idx, const bool visible)
   {
     m_meshParts.at(idx).visible = visible;
   }
 
-  bool isVisible(size_t idx) const
+  bool isVisible(const size_t idx) const
   {
     return m_meshParts.at(idx).visible;
   }
@@ -189,6 +197,11 @@ class SkeletalModelNode : public render::scene::Node
   [[nodiscard]] const gl::ShaderStorageBuffer<glm::mat4>&
     getMeshMatricesBuffer(const std::function<bool()>& smooth) const;
 
+  [[nodiscard]] const gl::ShaderStorageBuffer<glm::mat4>&
+    getNextMeshMatricesBuffer(const std::function<bool()>& smooth) const;
+
+  void updateSmoothMatrices();
+
   void clearParts()
   {
     m_meshParts.clear();
@@ -196,10 +209,10 @@ class SkeletalModelNode : public render::scene::Node
     rebuildMesh();
   }
 
-  void setAnim(const gsl::not_null<const world::Animation*>& anim,
+  void setAnim(const gsl_lite::not_null<const world::Animation*>& anim,
                const std::optional<core::Frame>& frame = std::nullopt);
 
-  void replaceAnim(const gsl::not_null<const world::Animation*>& anim, const core::Frame& localFrame);
+  void replaceAnim(const gsl_lite::not_null<const world::Animation*>& anim, const core::Frame& localFrame);
 
   [[nodiscard]] const auto& getFrame() const noexcept
   {
@@ -213,11 +226,12 @@ class SkeletalModelNode : public render::scene::Node
     return m_anim;
   }
 
-  void resetInterpolation() noexcept
+  void resetSmoothing() noexcept
   {
     for(auto& part : m_meshParts)
     {
       part.poseMatrixSmooth.reset();
+      part.nextPoseMatrixSmooth.reset();
     }
   }
 
@@ -234,7 +248,9 @@ class SkeletalModelNode : public render::scene::Node
 
     glm::mat4 patch{1.0f};
     glm::mat4 poseMatrix{1.0f};
-    mutable std::optional<glm::mat4> poseMatrixSmooth;
+    std::optional<glm::mat4> poseMatrixSmooth;
+    glm::mat4 nextPoseMatrix{1.0f};
+    std::optional<glm::mat4> nextPoseMatrixSmooth;
     std::shared_ptr<world::RenderMeshData> mesh{nullptr};
     std::shared_ptr<world::RenderMeshData> currentMesh{nullptr};
     gl::SRGBA8 reflective{0, 0, 0, 0};
@@ -247,26 +263,29 @@ class SkeletalModelNode : public render::scene::Node
       return visible != currentVisible || mesh != currentMesh || reflective != currentReflective;
     }
 
+    void updateSmoothMatrices();
+
     void serialize(const serialization::Serializer<world::World>& ser) const;
     void deserialize(const serialization::Deserializer<world::World>& ser);
     [[nodiscard]] static MeshPart create(const serialization::Deserializer<world::World>& ser);
   };
 
-  gsl::not_null<const world::World*> m_world;
-  gsl::not_null<const world::SkeletalModelType*> m_model;
+  gsl_lite::not_null<world::World*> m_world;
+  gsl_lite::not_null<const world::SkeletalModelType*> m_model;
   std::vector<MeshPart> m_meshParts;
   mutable std::unique_ptr<gl::ShaderStorageBuffer<glm::mat4>> m_meshMatricesBuffer;
+  mutable std::unique_ptr<gl::ShaderStorageBuffer<glm::mat4>> m_nextMeshMatricesBuffer;
   bool m_forceMeshRebuild = false;
 
   const world::Animation* m_anim = nullptr;
   core::Frame m_frame = 0_frame;
 
-  void updatePose(const InterpolationInfo& framePair);
+  void calculatePoseMatrices(const AnimSegmentInterpolationInfo& framePair, glm::mat4 MeshPart::* targetMatrix);
+  AnimSegmentInterpolationInfo getInterpolationInfo(const world::Animation& anim, core::Frame frame) const;
 
   bool m_shadowCaster;
 };
 
 void serialize(const std::shared_ptr<SkeletalModelNode>& data, const serialization::Serializer<world::World>& ser);
 void deserialize(std::shared_ptr<SkeletalModelNode>& data, const serialization::Deserializer<world::World>& ser);
-
-} // namespace engine
+} // namespace engine
\ No newline at end of file
diff --git a/src/engine/throttler.h b/src/engine/throttler.h
index 1bd34b281..9ad00d18b 100644
--- a/src/engine/throttler.h
+++ b/src/engine/throttler.h
@@ -2,6 +2,7 @@
 
 #include "core/magic.h"
 
+#include <algorithm>
 #include <chrono>
 #include <thread>
 
@@ -11,36 +12,56 @@ class Throttler
 {
 public:
   Throttler()
-      : m_nextFrameTime{std::chrono::high_resolution_clock::now() + FrameDuration}
+      : m_now{std::chrono::high_resolution_clock::now()}
+      , m_nextLogicTick{std::chrono::high_resolution_clock::now()}
   {
+    reset();
   }
 
-  void wait()
+  [[nodiscard]] bool isTimeForLogic() const noexcept
   {
-    // frame rate throttling
-    const auto now = std::chrono::high_resolution_clock::now();
-    const auto wait = std::chrono::duration_cast<TimeType>(m_nextFrameTime - now).count();
+    return m_isLogicTick;
+  }
 
-    if(wait > 0)
+  void tick()
+  {
+    m_now = std::chrono::high_resolution_clock::now();
+    if(m_now < m_nextLogicTick)
     {
-      std::this_thread::sleep_until(m_nextFrameTime);
-      m_nextFrameTime += FrameDuration;
+      m_isLogicTick = false;
     }
     else
     {
-      m_nextFrameTime = now + FrameDuration;
+      m_nextLogicTick += LogicTickDuration;
+      m_isLogicTick = true;
     }
+
+    const auto elapsed = m_now - (m_nextLogicTick - LogicTickDuration);
+    const auto factor = std::chrono::duration_cast<std::chrono::duration<float>>(elapsed).count()
+                        / std::chrono::duration_cast<std::chrono::duration<float>>(LogicTickDuration).count();
+    m_interTickFactor = std::clamp(factor, 0.0f, 1.0f);
+  }
+
+  [[nodiscard]] float getInterTickFactor() const noexcept
+  {
+    return m_interTickFactor;
   }
 
   void reset() noexcept
   {
-    m_nextFrameTime = std::chrono::high_resolution_clock::now() + FrameDuration;
+    m_now = std::chrono::high_resolution_clock::now();
+    m_nextLogicTick = m_now + LogicTickDuration;
+    m_interTickFactor = 0;
+    m_isLogicTick = true;
   }
 
 private:
   using TimeType = std::chrono::microseconds;
-  static constexpr TimeType FrameDuration = std::chrono::duration_cast<TimeType>(core::TimePerFrame);
+  static constexpr TimeType LogicTickDuration = std::chrono::duration_cast<TimeType>(core::TimePerFrame);
 
-  std::chrono::high_resolution_clock::time_point m_nextFrameTime;
+  std::chrono::high_resolution_clock::time_point m_now;
+  std::chrono::high_resolution_clock::time_point m_nextLogicTick;
+  float m_interTickFactor = 0;
+  bool m_isLogicTick = true;
 };
 } // namespace engine
diff --git a/src/engine/world/animation.h b/src/engine/world/animation.h
index 271c74960..d6e713f5b 100644
--- a/src/engine/world/animation.h
+++ b/src/engine/world/animation.h
@@ -4,7 +4,7 @@
 #include "core/units.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace loader::file
 {
@@ -33,6 +33,6 @@ struct Animation
   const int16_t* animCommands = nullptr;
 
   const Animation* nextAnimation = nullptr;
-  gsl::span<const Transitions> transitions;
+  gsl_lite::span<const Transitions> transitions;
 };
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/box.h b/src/engine/world/box.h
index 1dd0161d0..3241b6f08 100644
--- a/src/engine/world/box.h
+++ b/src/engine/world/box.h
@@ -6,7 +6,7 @@
 #include "serialization/serialization_fwd.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <vector>
 
 namespace engine::world
@@ -25,7 +25,7 @@ struct Box
   mutable bool blocked = true;
   bool blockable = true;
 
-  std::vector<gsl::not_null<Box*>> overlaps;
+  std::vector<gsl_lite::not_null<Box*>> overlaps;
 
   ZoneId zoneFly = 0;
   ZoneId zoneFlySwapped = 0;
@@ -34,7 +34,7 @@ struct Box
   ZoneId zoneGround2 = 0;
   ZoneId zoneGround2Swapped = 0;
 
-  static const ZoneId Box::*getZoneRef(const bool swapped, bool isFlying, const core::Length& step) noexcept
+  static const ZoneId Box::* getZoneRef(const bool swapped, const bool isFlying, const core::Length& step) noexcept
   {
     if(isFlying)
     {
@@ -53,4 +53,4 @@ struct Box
   void serialize(const serialization::Serializer<World>& ser) const;
   void deserialize(const serialization::Deserializer<World>& ser);
 };
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/camerasink.h b/src/engine/world/camerasink.h
index d2cd6a6a7..8076c7f12 100644
--- a/src/engine/world/camerasink.h
+++ b/src/engine/world/camerasink.h
@@ -26,8 +26,8 @@ struct CameraSink
     uint16_t box_index;
   };
 
-  void serialize(const serialization::Serializer<engine::world::World>& ser) const;
-  void deserialize(const serialization::Deserializer<engine::world::World>& ser);
+  void serialize(const serialization::Serializer<World>& ser) const;
+  void deserialize(const serialization::Deserializer<World>& ser);
 
   constexpr bool isActive() const noexcept
   {
diff --git a/src/engine/world/cinematicframe.h b/src/engine/world/cinematicframe.h
index 6988db8d3..c253af4de 100644
--- a/src/engine/world/cinematicframe.h
+++ b/src/engine/world/cinematicframe.h
@@ -8,7 +8,7 @@ struct CinematicFrame
 {
   core::TRVec lookAt;
   core::TRVec position;
-  float fov;
-  float rotZ;
+  core::Radians fov;
+  core::Radians rotZ;
 };
 } // namespace engine::world
diff --git a/src/engine/world/rendermeshdata.cpp b/src/engine/world/rendermeshdata.cpp
index 46c5f95cb..b24bb199e 100644
--- a/src/engine/world/rendermeshdata.cpp
+++ b/src/engine/world/rendermeshdata.cpp
@@ -29,7 +29,7 @@
 #include <gl/renderstate.h>
 #include <gl/vertexarray.h>
 #include <gl/vertexbuffer.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <initializer_list>
 #include <memory>
@@ -44,7 +44,7 @@ class Program;
 namespace engine::world
 {
 RenderMeshData::RenderMeshData(const loader::file::Mesh& mesh,
-                               const std::vector<engine::world::AtlasTile>& atlasTiles,
+                               const std::vector<AtlasTile>& atlasTiles,
                                const std::array<gl::SRGBA8, 256>& palette)
 {
   for(const auto& quad : mesh.textured_rectangles)
@@ -81,17 +81,17 @@ RenderMeshData::RenderMeshData(const loader::file::Mesh& mesh,
       {
         if(i <= 2)
         {
-          static const std::array<int, 3> indices{0, 1, 2};
-          iv.normal = engine::world::generateNormal(quad.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
-                                                    quad.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
-                                                    quad.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
+          static constexpr std::array indices{0, 1, 2};
+          iv.normal = generateNormal(quad.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
+                                     quad.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
+                                     quad.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
         }
         else
         {
-          static const std::array<int, 3> indices{0, 2, 3};
-          iv.normal = engine::world::generateNormal(quad.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
-                                                    quad.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
-                                                    quad.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
+          static constexpr std::array indices{0, 2, 3};
+          iv.normal = generateNormal(quad.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
+                                     quad.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
+                                     quad.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
         }
       }
       else
@@ -106,7 +106,7 @@ RenderMeshData::RenderMeshData(const loader::file::Mesh& mesh,
 
     for(const size_t i : {0, 1, 2, 0, 2, 3})
     {
-      const auto idx = gsl::narrow<IndexType>(firstVertex + i);
+      const auto idx = gsl_lite::narrow<IndexType>(firstVertex + i);
       if(tile.isOpaque())
         m_opaqueIndices.emplace_back(idx);
       else
@@ -133,17 +133,17 @@ RenderMeshData::RenderMeshData(const loader::file::Mesh& mesh,
       {
         if(i <= 2)
         {
-          static const std::array<int, 3> indices{0, 1, 2};
-          iv.normal = engine::world::generateNormal(quad.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
-                                                    quad.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
-                                                    quad.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
+          static constexpr std::array indices{0, 1, 2};
+          iv.normal = generateNormal(quad.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
+                                     quad.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
+                                     quad.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
         }
         else
         {
-          static const std::array<int, 3> indices{0, 2, 3};
-          iv.normal = engine::world::generateNormal(quad.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
-                                                    quad.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
-                                                    quad.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
+          static constexpr std::array indices{0, 2, 3};
+          iv.normal = generateNormal(quad.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
+                                     quad.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
+                                     quad.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
         }
       }
       else
@@ -154,7 +154,7 @@ RenderMeshData::RenderMeshData(const loader::file::Mesh& mesh,
     }
     for(const size_t i : {0, 1, 2, 0, 2, 3})
     {
-      const auto idx = gsl::narrow<IndexType>(firstVertex + i);
+      const auto idx = gsl_lite::narrow<IndexType>(firstVertex + i);
       if(color.a >= 1.0f)
         m_opaqueIndices.emplace_back(idx);
       else
@@ -177,16 +177,16 @@ RenderMeshData::RenderMeshData(const loader::file::Mesh& mesh,
       if(mesh.isFlatShaded() || mesh.normals.empty()
          || tri.vertices[i].from(mesh.normals) == core::TRVec{0_len, 0_len, 0_len})
       {
-        static const std::array<int, 3> indices{0, 1, 2};
-        iv.normal = engine::world::generateNormal(tri.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
-                                                  tri.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
-                                                  tri.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
+        static constexpr std::array indices{0, 1, 2};
+        iv.normal = generateNormal(tri.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
+                                   tri.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
+                                   tri.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
       }
       else
       {
         iv.normal = tri.vertices[i].from(mesh.normals).toRenderSystem();
       }
-      const auto idx = gsl::narrow<IndexType>(m_vertices.size());
+      const auto idx = gsl_lite::narrow<IndexType>(m_vertices.size());
       if(tile.isOpaque())
         m_opaqueIndices.emplace_back(idx);
       else
@@ -211,16 +211,16 @@ RenderMeshData::RenderMeshData(const loader::file::Mesh& mesh,
       if(mesh.isFlatShaded() || mesh.normals.empty()
          || tri.vertices[i].from(mesh.normals) == core::TRVec{0_len, 0_len, 0_len})
       {
-        static const std::array<int, 3> indices{0, 1, 2};
-        iv.normal = engine::world::generateNormal(tri.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
-                                                  tri.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
-                                                  tri.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
+        static constexpr std::array indices{0, 1, 2};
+        iv.normal = generateNormal(tri.vertices[indices[(i + 0) % 3]].from(mesh.vertices),
+                                   tri.vertices[indices[(i + 1) % 3]].from(mesh.vertices),
+                                   tri.vertices[indices[(i + 2) % 3]].from(mesh.vertices));
       }
       else
       {
         iv.normal = tri.vertices[i].from(mesh.normals).toRenderSystem();
       }
-      const auto idx = gsl::narrow<IndexType>(m_vertices.size());
+      const auto idx = gsl_lite::narrow<IndexType>(m_vertices.size());
       if(color.a >= 1.0f)
         m_opaqueIndices.emplace_back(idx);
       else
@@ -232,28 +232,28 @@ RenderMeshData::RenderMeshData(const loader::file::Mesh& mesh,
 
 gslu::nn_shared<render::scene::Mesh>
   RenderMeshDataCompositor::toMesh(render::material::MaterialManager& materialManager,
-                                   bool skeletal,
-                                   bool shadowCaster,
+                                   const bool skeletal,
+                                   const bool shadowCaster,
                                    const std::function<bool()>& smooth,
                                    const std::function<int32_t()>& lightingMode,
                                    const std::string& label)
 {
-  auto vb = gsl::make_shared<gl::VertexBuffer<RenderMeshData::RenderVertex>>(
+  auto vb = gsl_lite::make_shared<gl::VertexBuffer<RenderMeshData::RenderVertex>>(
     RenderMeshData::RenderVertex::getLayout(), label + gl::VboSuffix, gl::api::BufferUsage::StaticDraw, m_vertices);
 
 #ifndef NDEBUG
-  for(auto idx : m_opaqueIndices)
+  for(const auto idx : m_opaqueIndices)
   {
     BOOST_ASSERT(idx < m_vertices.size());
   }
-  for(auto idx : m_nonOpaqueIndices)
+  for(const auto idx : m_nonOpaqueIndices)
   {
     BOOST_ASSERT(idx < m_vertices.size());
   }
 #endif
-  auto indexBufferOpaque = gsl::make_shared<gl::ElementArrayBuffer<RenderMeshData::IndexType>>(
+  auto indexBufferOpaque = gsl_lite::make_shared<gl::ElementArrayBuffer<RenderMeshData::IndexType>>(
     label + gl::IndexBufferSuffix, gl::api::BufferUsage::StaticDraw, m_opaqueIndices);
-  auto indexBufferNonOpaque = gsl::make_shared<gl::ElementArrayBuffer<RenderMeshData::IndexType>>(
+  auto indexBufferNonOpaque = gsl_lite::make_shared<gl::ElementArrayBuffer<RenderMeshData::IndexType>>(
     label + gl::IndexBufferSuffix, gl::api::BufferUsage::StaticDraw, m_nonOpaqueIndices);
 
   const auto materialOpaque = materialManager.getGeometry(false, skeletal, false, true, smooth, lightingMode);
@@ -261,21 +261,21 @@ gslu::nn_shared<render::scene::Mesh>
   const auto materialCSMDepthOnly = materialManager.getCSMDepthOnly(skeletal, smooth);
   const auto materialDepthOnly = materialManager.getDepthOnly(skeletal, smooth);
 
-  auto vaoOpaque = gsl::make_shared<gl::VertexArray<RenderMeshData::IndexType, RenderMeshData::RenderVertex>>(
+  auto vaoOpaque = gsl_lite::make_shared<gl::VertexArray<RenderMeshData::IndexType, RenderMeshData::RenderVertex>>(
     indexBufferOpaque,
     vb,
-    std::vector<const gl::Program*>{&materialOpaque->getShaderProgram()->getHandle(),
+    std::vector{&materialOpaque->getShaderProgram()->getHandle(),
                                     &materialDepthOnly->getShaderProgram()->getHandle(),
                                     &materialCSMDepthOnly->getShaderProgram()->getHandle()},
     label + "-opaque" + gl::VaoSuffix);
-  auto vaoNonOpaque = gsl::make_shared<gl::VertexArray<RenderMeshData::IndexType, RenderMeshData::RenderVertex>>(
+  auto vaoNonOpaque = gsl_lite::make_shared<gl::VertexArray<RenderMeshData::IndexType, RenderMeshData::RenderVertex>>(
     indexBufferNonOpaque,
     vb,
-    std::vector<const gl::Program*>{&materialNonOpaque->getShaderProgram()->getHandle(),
+    std::vector{&materialNonOpaque->getShaderProgram()->getHandle(),
                                     &materialDepthOnly->getShaderProgram()->getHandle(),
                                     &materialCSMDepthOnly->getShaderProgram()->getHandle()},
     label + "-nonopaque" + gl::VaoSuffix);
-  auto mesh = gsl::make_shared<render::scene::MeshImpl<RenderMeshData::IndexType, RenderMeshData::RenderVertex>>(
+  auto mesh = gsl_lite::make_shared<render::scene::MeshImpl<RenderMeshData::IndexType, RenderMeshData::RenderVertex>>(
     vaoOpaque, vaoNonOpaque, gl::api::PrimitiveType::Triangles);
 
   mesh->getMaterialGroup()
@@ -293,4 +293,4 @@ gslu::nn_shared<render::scene::Mesh>
 
   return mesh;
 }
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/rendermeshdata.h b/src/engine/world/rendermeshdata.h
index 0133e9b85..5de109224 100644
--- a/src/engine/world/rendermeshdata.h
+++ b/src/engine/world/rendermeshdata.h
@@ -11,7 +11,7 @@
 #include <glm/fwd.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <string>
 #include <vector>
@@ -79,7 +79,7 @@ class RenderMeshData final
   };
 
   explicit RenderMeshData(const loader::file::Mesh& mesh,
-                          const std::vector<engine::world::AtlasTile>& atlasTiles,
+                          const std::vector<AtlasTile>& atlasTiles,
                           const std::array<gl::SRGBA8, 256>& palette);
 
   [[nodiscard]] const auto& getVertices() const noexcept
@@ -108,7 +108,7 @@ class RenderMeshDataCompositor final
 public:
   void append(const RenderMeshData& data, const gl::SRGBA8& reflective)
   {
-    const auto vertexOffset = gsl::narrow<RenderMeshData::IndexType>(m_vertices.size());
+    const auto vertexOffset = gsl_lite::narrow<RenderMeshData::IndexType>(m_vertices.size());
     for(auto v : data.getVertices())
     {
       v.boneIndex = m_boneIndex;
@@ -116,15 +116,15 @@ class RenderMeshDataCompositor final
       m_vertices.emplace_back(v);
     }
 
-    for(auto i : data.getOpaqueIndices())
+    for(const auto i : data.getOpaqueIndices())
     {
       // cppcheck-suppress useStlAlgorithm
-      m_opaqueIndices.emplace_back(gsl::narrow<RenderMeshData::IndexType>(i + vertexOffset));
+      m_opaqueIndices.emplace_back(gsl_lite::narrow<RenderMeshData::IndexType>(i + vertexOffset));
     }
-    for(auto i : data.getNonOpaqueIndices())
+    for(const auto i : data.getNonOpaqueIndices())
     {
       // cppcheck-suppress useStlAlgorithm
-      m_nonOpaqueIndices.emplace_back(gsl::narrow<RenderMeshData::IndexType>(i + vertexOffset));
+      m_nonOpaqueIndices.emplace_back(gsl_lite::narrow<RenderMeshData::IndexType>(i + vertexOffset));
     }
 
     ++m_boneIndex;
@@ -153,4 +153,4 @@ class RenderMeshDataCompositor final
   std::vector<RenderMeshData::IndexType> m_nonOpaqueIndices;
   glm::int32_t m_boneIndex = 0;
 };
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/room.cpp b/src/engine/world/room.cpp
index b5698c7fb..fd250dc16 100644
--- a/src/engine/world/room.cpp
+++ b/src/engine/world/room.cpp
@@ -61,13 +61,14 @@
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <initializer_list>
 #include <iterator>
 #include <limits>
 #include <memory>
 #include <optional>
+#include <random>
 #include <set>
 #include <string>
 #include <tuple>
@@ -125,25 +126,25 @@ struct RoomRenderMesh
                                               const std::string& label)
   {
 #ifndef NDEBUG
-    for(auto idx : m_opaqueIndices)
+    for(const auto idx : m_opaqueIndices)
     {
       BOOST_ASSERT(idx < vbuf->size());
     }
-    for(auto idx : m_nonOpaqueIndices)
+    for(const auto idx : m_nonOpaqueIndices)
     {
       BOOST_ASSERT(idx < vbuf->size());
     }
 #endif
 
-    auto opaqueIndexBuffer = gsl::make_shared<gl::ElementArrayBuffer<IndexType>>(
+    auto opaqueIndexBuffer = gsl_lite::make_shared<gl::ElementArrayBuffer<IndexType>>(
       label + gl::IndexBufferSuffix, gl::api::BufferUsage::StaticDraw, m_opaqueIndices);
-    auto nonOpaqueIndexBuffer = gsl::make_shared<gl::ElementArrayBuffer<IndexType>>(
+    auto nonOpaqueIndexBuffer = gsl_lite::make_shared<gl::ElementArrayBuffer<IndexType>>(
       label + gl::IndexBufferSuffix, gl::api::BufferUsage::StaticDraw, m_nonOpaqueIndices);
 
     auto vBufs = std::make_tuple(vbuf, uvBuf);
 
-    auto mesh = gsl::make_shared<render::scene::MeshImpl<IndexType, RoomRenderVertex, render::AnimatedUV>>(
-      gsl::make_shared<gl::VertexArray<IndexType, RoomRenderVertex, render::AnimatedUV>>(
+    auto mesh = gsl_lite::make_shared<render::scene::MeshImpl<IndexType, RoomRenderVertex, render::AnimatedUV>>(
+      gsl_lite::make_shared<gl::VertexArray<IndexType, RoomRenderVertex, render::AnimatedUV>>(
         opaqueIndexBuffer,
         vBufs,
         std::vector{&m_materialFullOpaque->getShaderProgram()->getHandle(),
@@ -151,7 +152,7 @@ struct RoomRenderMesh
                     m_materialCSMDepthOnly == nullptr ? nullptr
                                                       : &m_materialCSMDepthOnly->getShaderProgram()->getHandle()},
         label + "-opaque" + gl::VaoSuffix),
-      gsl::make_shared<gl::VertexArray<IndexType, RoomRenderVertex, render::AnimatedUV>>(
+      gsl_lite::make_shared<gl::VertexArray<IndexType, RoomRenderVertex, render::AnimatedUV>>(
         nonOpaqueIndexBuffer,
         vBufs,
         std::vector{&m_materialFullNonOpaque->getShaderProgram()->getHandle(),
@@ -197,7 +198,7 @@ void Portal::buildMesh(const loader::file::Portal& srcPortal,
     glm::vec3 pos;
   };
 
-  static const constexpr float PortalOffset = 8;
+  static constexpr float PortalOffset = 8;
 
   std::array<Vertex, 4> glVertices{};
   const auto offset = glm::normalize(srcPortal.normal.toRenderSystem()) * PortalOffset;
@@ -205,15 +206,15 @@ void Portal::buildMesh(const loader::file::Portal& srcPortal,
     glVertices[i].pos = srcPortal.vertices[i].toRenderSystem() - offset;
 
   const gl::VertexLayout<Vertex> layout{{VERTEX_ATTRIBUTE_POSITION_NAME, &Vertex::pos}};
-  auto vb = gsl::make_shared<gl::VertexBuffer<Vertex>>(
+  auto vb = gsl_lite::make_shared<gl::VertexBuffer<Vertex>>(
     layout, "portal" + gl::VboSuffix, gl::api::BufferUsage::StaticDraw, glVertices);
 
-  static const std::array<uint16_t, 6> indices{0, 1, 2, 0, 2, 3};
+  static constexpr std::array<uint16_t, 6> indices{0, 1, 2, 0, 2, 3};
 
-  auto indexBuffer = gsl::make_shared<gl::ElementArrayBuffer<uint16_t>>(
+  auto indexBuffer = gsl_lite::make_shared<gl::ElementArrayBuffer<uint16_t>>(
     "portal" + gl::IndexBufferSuffix, gl::api::BufferUsage::StaticDraw, indices);
 
-  auto vao = gsl::make_shared<gl::VertexArray<uint16_t, Vertex>>(
+  auto vao = gsl_lite::make_shared<gl::VertexArray<uint16_t, Vertex>>(
     indexBuffer, vb, std::vector{&material->getShaderProgram()->getHandle()}, "portal" + gl::VaoSuffix);
   mesh = std::make_shared<render::scene::MeshImpl<uint16_t, Vertex>>(nullptr, vao, gl::api::PrimitiveType::Triangles);
   mesh->getMaterialGroup().set(render::material::RenderMode::DepthOnly, material);
@@ -232,14 +233,14 @@ void Room::createSceneNode(const loader::file::Room& srcRoom,
   }
   else
   {
-    auto textureAnimator = gsl::make_shared<render::TextureAnimator>(textureAnimData);
+    auto textureAnimator = gsl_lite::make_shared<render::TextureAnimator>(textureAnimData);
 
     const auto [mesh, uvBuffer] = buildMesh(srcRoom, world.getEngine(), world.getWorldGeometry(), *textureAnimator);
     node->setRenderable(mesh);
 
     roomGeometry = std::make_shared<RoomGeometry>(mesh, textureAnimator, uvBuffer);
 
-    world.getWorldGeometry().setRoomGeometry(physicalId, gsl::not_null{roomGeometry});
+    world.getWorldGeometry().setRoomGeometry(physicalId, gsl_lite::not_null{roomGeometry});
   }
 
   node->bind("u_lightAmbient",
@@ -285,7 +286,7 @@ void Room::createSceneNode(const loader::file::Room& srcRoom,
     subNode->setRenderable(sm.staticMesh->renderMesh);
     subNode->getRenderState().setScissorTest(false);
     subNode->setLocalMatrix(translate(glm::mat4{1.0f}, (sm.position - position).toRenderSystem())
-                            * rotate(glm::mat4{1.0f}, toRad(sm.rotation), glm::vec3{0, -1, 0}));
+                            * rotate(glm::mat4{1.0f}, toRad(sm.rotation).get<>(), glm::vec3{0, -1, 0}));
 
     subNode->bind("u_lightAmbient",
                   [brightness = toBrightness(ambientShade)](
@@ -380,21 +381,20 @@ void Room::createSceneNode(const loader::file::Room& srcRoom,
     sceneryNodes.emplace_back(std::move(spriteNode));
   }
 
-  std::transform(srcRoom.portals.begin(),
-                 srcRoom.portals.end(),
-                 std::back_inserter(portals),
-                 [material = materialManager.getWaterSurface(), &world](const loader::file::Portal& portal)
-                 {
-                   Portal p{gsl::not_null{&world.getRooms().at(portal.adjoining_room.get())},
-                            portal.normal.toRenderSystem(),
-                            {portal.vertices[0].toRenderSystem(),
-                             portal.vertices[1].toRenderSystem(),
-                             portal.vertices[2].toRenderSystem(),
-                             portal.vertices[3].toRenderSystem()},
-                            nullptr};
-                   p.buildMesh(portal, material);
-                   return p;
-                 });
+  std::ranges::transform(srcRoom.portals,
+                         std::back_inserter(portals),
+                         [material = materialManager.getWaterSurface(), &world](const loader::file::Portal& portal)
+                         {
+                           Portal p{gsl_lite::not_null{&world.getRooms().at(portal.adjoining_room.get())},
+                                    portal.normal.toRenderSystem(),
+                                    {portal.vertices[0].toRenderSystem(),
+                                     portal.vertices[1].toRenderSystem(),
+                                     portal.vertices[2].toRenderSystem(),
+                                     portal.vertices[3].toRenderSystem()},
+                                    nullptr};
+                           p.buildMesh(portal, material);
+                           return p;
+                         });
 
   collectShaderLights(world.getEngine().getEngineConfig()->renderSettings.getLightCollectionDepth());
 
@@ -405,7 +405,7 @@ void Room::createSceneNode(const loader::file::Room& srcRoom,
     verticesBBoxMax = glm::max(verticesBBoxMax, vv);
   }
 
-  regenerateDust(world.getPresenter(),
+  regenerateDust(world.getEngine().getPresenter(),
                  materialManager.getDustParticle(),
                  world.getEngine().getEngineConfig()->renderSettings.dustActive,
                  world.getEngine().getEngineConfig()->renderSettings.dustDensity);
@@ -415,11 +415,11 @@ void Room::createSceneNode(const loader::file::Room& srcRoom,
   particles.setAmbient(*this);
 }
 
-void patchHeightsForBlock(const engine::objects::Object& object, const core::Length& height)
+void patchHeightsForBlock(const objects::Object& object, const core::Length& height)
 {
   auto tmp = object.m_state.location;
   // TODO Ugly const_cast
-  const auto groundSector = gsl::not_null{const_cast<Sector*>(tmp.updateRoom().get())};
+  const auto groundSector = gsl_lite::not_null{const_cast<Sector*>(tmp.updateRoom().get())};
   const auto topSector = tmp.moved(0_len, height - 1_sectors, 0_len).updateRoom();
 
   if(groundSector->floorHeight == core::InvalidHeight)
@@ -475,7 +475,7 @@ void Room::resetScenery()
   node->removeAllChildren();
   for(const auto& subNode : sceneryNodes)
   {
-    addChild(gsl::not_null{node}, subNode);
+    addChild(gsl_lite::not_null{node}, subNode);
   }
 }
 
@@ -508,24 +508,24 @@ const Sector* Room::getSectorByIndex(const int dx, const int dz) const
   return &sectors[sectorCountZ * dx + dz];
 }
 
-void Room::collectShaderLights(size_t depth)
+void Room::collectShaderLights(const size_t depth)
 {
   bufferLights.clear();
   if(lights.empty())
   {
     if(lightsBuffer == nullptr || lightsBuffer->size() != 0)
     {
-      lightsBuffer = std::make_shared<gl::ShaderStorageBuffer<engine::ShaderLight>>(
+      lightsBuffer = std::make_shared<gl::ShaderStorageBuffer<ShaderLight>>(
         "lights-buffer", gl::api::BufferUsage::StaticDraw, bufferLights);
     }
     return;
   }
 
-  std::set<gsl::not_null<const Room*>> testRooms;
+  std::set<gsl_lite::not_null<const Room*>> testRooms;
   testRooms.emplace(this);
   for(size_t i = 0; i < depth; ++i)
   {
-    std::set<gsl::not_null<const Room*>> newTestRooms;
+    std::set<gsl_lite::not_null<const Room*>> newTestRooms;
     for(const auto& room : testRooms)
     {
       newTestRooms.emplace(room);
@@ -554,14 +554,14 @@ void Room::collectShaderLights(size_t depth)
     }
   }
 
-  lightsBuffer = std::make_shared<gl::ShaderStorageBuffer<engine::ShaderLight>>(
+  lightsBuffer = std::make_shared<gl::ShaderStorageBuffer<ShaderLight>>(
     "lights-buffer", gl::api::BufferUsage::StaticDraw, bufferLights);
 }
 
-void Room::regenerateDust(engine::Presenter& presenter,
+void Room::regenerateDust(Presenter& presenter,
                           const gslu::nn_shared<render::material::Material>& dustMaterial,
-                          bool isDustEnabled,
-                          uint8_t dustDensityDivisor)
+                          const bool isDustEnabled,
+                          const uint8_t dustDensityDivisor)
 {
   if(!isDustEnabled)
   {
@@ -577,7 +577,7 @@ void Room::regenerateDust(engine::Presenter& presenter,
   {
     presenter.drawLoadingScreen(_("Generating Dust Particles..."));
 
-    static const constexpr auto BaseGridAxisSubdivision = 12;
+    static constexpr auto BaseGridAxisSubdivision = 12;
     const auto resolution = (cbrt(dustDensityDivisor) / BaseGridAxisSubdivision * 1_sectors).cast<float>().get();
 
     std::vector<glm::vec3> vertices;
@@ -589,6 +589,9 @@ void Room::regenerateDust(engine::Presenter& presenter,
     indices.reserve(vertices.capacity());
     BOOST_LOG_TRIVIAL(debug) << "generating " << vertices.capacity() << " particles for " << label;
 
+    std::mt19937 gen(std::random_device{}());
+    std::uniform_real_distribution<float> dis(-resolution / 2, resolution / 2);
+
     // NOLINTNEXTLINE(cert-flp30-c)
     for(float x = verticesBBoxMin.x + resolution / 2; x <= verticesBBoxMax.x - resolution / 2; x += resolution)
     {
@@ -598,8 +601,8 @@ void Room::regenerateDust(engine::Presenter& presenter,
         // NOLINTNEXTLINE(cert-flp30-c)
         for(float z = verticesBBoxMin.z + resolution / 2; z <= verticesBBoxMax.z - resolution / 2; z += resolution)
         {
-          indices.emplace_back(gsl::narrow_cast<uint32_t>(vertices.size()));
-          vertices.emplace_back(x, y, z);
+          indices.emplace_back(gsl_lite::narrow_cast<uint32_t>(vertices.size()));
+          vertices.emplace_back(x + dis(gen), y + dis(gen), z + dis(gen));
         }
       }
     }
@@ -607,18 +610,19 @@ void Room::regenerateDust(engine::Presenter& presenter,
     static const gl::VertexLayout<glm::vec3> layout{
       {VERTEX_ATTRIBUTE_POSITION_NAME, gl::VertexAttribute<glm::vec3>::Single{}}};
 
-    auto vbuf = gsl::make_shared<gl::VertexBuffer<glm::vec3>>(
+    auto vbuf = gsl_lite::make_shared<gl::VertexBuffer<glm::vec3>>(
       layout, label + "-particles" + gl::VboSuffix, gl::api::BufferUsage::StaticDraw, vertices);
-    auto indexBuffer = gsl::make_shared<gl::ElementArrayBuffer<uint32_t>>(
+    auto indexBuffer = gsl_lite::make_shared<gl::ElementArrayBuffer<uint32_t>>(
       label + "-particles" + gl::IndexBufferSuffix, gl::api::BufferUsage::StaticDraw, indices);
 
-    auto vao = gsl::make_shared<gl::VertexArray<uint32_t, glm::vec3>>(
+    auto vao = gsl_lite::make_shared<gl::VertexArray<uint32_t, glm::vec3>>(
       indexBuffer,
       vbuf,
       std::vector{&dustMaterial->getShaderProgram()->getHandle()},
       label + "-particles" + gl::VaoSuffix);
     dustMesh
       = std::make_shared<render::scene::MeshImpl<uint32_t, glm::vec3>>(nullptr, vao, gl::api::PrimitiveType::Points);
+    dustMesh->getRenderState().setProgramPointSize(true);
     dustMesh->getMaterialGroup().set(render::material::RenderMode::FullNonOpaque, dustMaterial);
 
     dustMesh->bind("u_baseColor",
@@ -628,7 +632,7 @@ void Room::regenerateDust(engine::Presenter& presenter,
                      uniform.set(color);
                    });
 
-    roomGeometry->setDustCache(dustDensityDivisor, gsl::not_null{dustMesh});
+    roomGeometry->setDustCache(dustDensityDivisor, gsl_lite::not_null{dustMesh});
   }
 
   dust = std::make_shared<render::scene::Node>(label + "-particles");
@@ -699,14 +703,14 @@ void Room::buildMeshData(WorldGeometry& worldGeometry,
 
       if(i <= 2)
       {
-        static const std::array<int, 3> indices{0, 1, 2};
+        static constexpr std::array indices{0, 1, 2};
         iv.normal = generateNormal(quad.vertices[indices[(i + 0) % 3]].from(srcRoom.vertices).position,
                                    quad.vertices[indices[(i + 1) % 3]].from(srcRoom.vertices).position,
                                    quad.vertices[indices[(i + 2) % 3]].from(srcRoom.vertices).position);
       }
       else
       {
-        static const std::array<int, 3> indices{0, 2, 3};
+        static constexpr std::array indices{0, 2, 3};
         iv.normal = generateNormal(quad.vertices[indices[(i + 0) % 3]].from(srcRoom.vertices).position,
                                    quad.vertices[indices[(i + 1) % 3]].from(srcRoom.vertices).position,
                                    quad.vertices[indices[(i + 2) % 3]].from(srcRoom.vertices).position);
@@ -717,7 +721,7 @@ void Room::buildMeshData(WorldGeometry& worldGeometry,
 
     for(const int i : {0, 1, 2, 0, 2, 3})
     {
-      const auto idx = gsl::narrow<RoomRenderMesh::IndexType>(firstVertex + i);
+      const auto idx = gsl_lite::narrow<RoomRenderMesh::IndexType>(firstVertex + i);
       if(tile.isOpaque())
         renderMesh.m_opaqueIndices.emplace_back(idx);
       else
@@ -760,7 +764,7 @@ void Room::buildMeshData(WorldGeometry& worldGeometry,
                                 glm::vec4{tile.uvCoordinates[0], tile.uvCoordinates[1]},
                                 glm::vec4{tile.uvCoordinates[2], tile.uvCoordinates[3]});
 
-      static const std::array<int, 3> indices{0, 1, 2};
+      static constexpr std::array indices{0, 1, 2};
       iv.normal = generateNormal(tri.vertices[indices[(i + 0) % 3]].from(srcRoom.vertices).position,
                                  tri.vertices[indices[(i + 1) % 3]].from(srcRoom.vertices).position,
                                  tri.vertices[indices[(i + 2) % 3]].from(srcRoom.vertices).position);
@@ -770,7 +774,7 @@ void Room::buildMeshData(WorldGeometry& worldGeometry,
 
     for(const int i : {0, 1, 2})
     {
-      const auto idx = gsl::narrow<RoomRenderMesh::IndexType>(firstVertex + i);
+      const auto idx = gsl_lite::narrow<RoomRenderMesh::IndexType>(firstVertex + i);
       if(tile.isOpaque())
         renderMesh.m_opaqueIndices.emplace_back(idx);
       else
@@ -785,41 +789,42 @@ void Room::buildMeshData(WorldGeometry& worldGeometry,
 
 std::pair<gslu::nn_shared<render::scene::Mesh>, gslu::nn_shared<gl::VertexBuffer<render::AnimatedUV>>>
   Room::buildMesh(const loader::file::Room& srcRoom,
-                  const Engine& engine,
+                  Engine& engine,
                   WorldGeometry& worldGeometry,
                   render::TextureAnimator& textureAnimator)
 {
   RoomRenderMesh renderMesh;
-  renderMesh.m_materialDepthOnly = engine.getPresenter().getMaterialManager()->getDepthOnly(false,
-                                                                                            []()
-                                                                                            {
-                                                                                              return false;
-                                                                                            });
+  renderMesh.m_materialDepthOnly
+    = engine.getPresenter().getRenderSystem().getMaterialManager().getDepthOnly(false,
+                                                                                []
+                                                                                {
+                                                                                  return false;
+                                                                                });
   renderMesh.m_materialCSMDepthOnly = nullptr;
-  renderMesh.m_materialFullOpaque = engine.getPresenter().getMaterialManager()->getGeometry(
+  renderMesh.m_materialFullOpaque = engine.getPresenter().getRenderSystem().getMaterialManager().getGeometry(
     isWaterRoom,
     false,
     true,
     true,
-    []()
+    []
     {
       return false;
     },
-    [config = engine.getEngineConfig()]()
+    [config = engine.getEngineConfig()]
     {
       const auto& settings = config->renderSettings;
       return !settings.lightingModeActive ? 0 : settings.lightingMode;
     });
-  renderMesh.m_materialFullNonOpaque = engine.getPresenter().getMaterialManager()->getGeometry(
+  renderMesh.m_materialFullNonOpaque = engine.getPresenter().getRenderSystem().getMaterialManager().getGeometry(
     isWaterRoom,
     false,
     true,
     false,
-    []()
+    []
     {
       return false;
     },
-    [config = engine.getEngineConfig()]()
+    [config = engine.getEngineConfig()]
     {
       const auto& settings = config->renderSettings;
       return !settings.lightingModeActive ? 0 : settings.lightingMode;
@@ -833,7 +838,7 @@ std::pair<gslu::nn_shared<render::scene::Mesh>, gslu::nn_shared<gl::VertexBuffer
     BOOST_LOG_TRIVIAL(debug) << "room " << physicalId << " is non-opaque";
 
   const auto label = "Room:" + std::to_string(physicalId);
-  auto vbuf = gsl::make_shared<gl::VertexBuffer<RoomRenderVertex>>(
+  const auto vbuf = gsl_lite::make_shared<gl::VertexBuffer<RoomRenderVertex>>(
     RoomRenderVertex::getLayout(), label + gl::VboSuffix, gl::api::BufferUsage::StaticDraw, vbufData);
 
   static const gl::VertexLayout<render::AnimatedUV> uvAttribs{
@@ -841,7 +846,7 @@ std::pair<gslu::nn_shared<render::scene::Mesh>, gslu::nn_shared<gl::VertexBuffer
     {VERTEX_ATTRIBUTE_QUAD_UV12, &render::AnimatedUV::quadUv12},
     {VERTEX_ATTRIBUTE_QUAD_UV34, &render::AnimatedUV::quadUv34},
   };
-  auto uvCoordsBuffer = gsl::make_shared<gl::VertexBuffer<render::AnimatedUV>>(
+  auto uvCoordsBuffer = gsl_lite::make_shared<gl::VertexBuffer<render::AnimatedUV>>(
     uvAttribs, label + "-uv" + gl::VboSuffix, gl::api::BufferUsage::DynamicDraw, uvCoordsData);
 
   auto resMesh = renderMesh.toMesh(vbuf, uvCoordsBuffer, label);
@@ -850,4 +855,4 @@ std::pair<gslu::nn_shared<render::scene::Mesh>, gslu::nn_shared<gl::VertexBuffer
 
   return {resMesh, uvCoordsBuffer};
 }
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/room.h b/src/engine/world/room.h
index 2693b6ec7..1a71a4412 100644
--- a/src/engine/world/room.h
+++ b/src/engine/world/room.h
@@ -15,7 +15,7 @@
 #include <gl/buffer.h>
 #include <gl/vertexbuffer.h>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <limits>
 #include <memory>
@@ -75,7 +75,7 @@ class RoomGeometry;
 
 struct Portal
 {
-  gsl::not_null<Room*> adjoiningRoom;
+  gsl_lite::not_null<Room*> adjoiningRoom;
   glm::vec3 normal;
   std::array<glm::vec3, 4> vertices;
   std::shared_ptr<render::scene::Mesh> mesh;
@@ -95,7 +95,7 @@ struct RoomStaticMesh
   core::TRVec position;
   core::Angle rotation;
   core::Shade shade;
-  gsl::not_null<const StaticMesh*> staticMesh;
+  gsl_lite::not_null<const StaticMesh*> staticMesh;
 };
 
 struct Room
@@ -121,7 +121,7 @@ struct Room
   glm::vec3 verticesBBoxMin{std::numeric_limits<float>::max()};
   glm::vec3 verticesBBoxMax{std::numeric_limits<float>::lowest()};
   std::shared_ptr<render::scene::Node> dust{};
-  mutable engine::InstancedParticleCollection particles{};
+  mutable InstancedParticleCollection particles{};
   std::shared_ptr<RoomGeometry> roomGeometry{};
 
   void createSceneNode(const loader::file::Room& srcRoom,
@@ -149,7 +149,7 @@ struct Room
 
   [[nodiscard]] const Sector* getSectorByIndex(int dx, int dz) const;
 
-  [[nodiscard]] gsl::not_null<const Sector*> getBoundarySectorByIndex(int dx, int dz) const
+  [[nodiscard]] gsl_lite::not_null<const Sector*> getBoundarySectorByIndex(int dx, int dz) const
   {
     if(dz <= 0)
     {
@@ -165,7 +165,7 @@ struct Room
     {
       dx = std::clamp(dx, 0, sectorCountX - 1);
     }
-    return gsl::not_null{getSectorByIndex(dx, dz)};
+    return gsl_lite::not_null{getSectorByIndex(dx, dz)};
   }
 
   void resetScenery();
@@ -173,11 +173,11 @@ struct Room
   void serialize(const serialization::Serializer<World>& ser) const;
   void deserialize(const serialization::Deserializer<World>& ser);
 
-  std::vector<engine::ShaderLight> bufferLights{};
-  std::shared_ptr<gl::ShaderStorageBuffer<engine::ShaderLight>> lightsBuffer{};
+  std::vector<ShaderLight> bufferLights{};
+  std::shared_ptr<gl::ShaderStorageBuffer<ShaderLight>> lightsBuffer{};
 
   void collectShaderLights(size_t depth);
-  void regenerateDust(engine::Presenter& presenter,
+  void regenerateDust(Presenter& presenter,
                       const gslu::nn_shared<render::material::Material>& dustMaterial,
                       bool isDustEnabled,
                       uint8_t dustDensityDivisor);
@@ -192,12 +192,12 @@ struct Room
 
   [[nodiscard]] std::pair<gslu::nn_shared<render::scene::Mesh>, gslu::nn_shared<gl::VertexBuffer<render::AnimatedUV>>>
     buildMesh(const loader::file::Room& srcRoom,
-              const Engine& engine,
+              Engine& engine,
               WorldGeometry& worldGeometry,
               render::TextureAnimator& textureAnimator);
 };
 
-extern void patchHeightsForBlock(const engine::objects::Object& object, const core::Length& height);
+extern void patchHeightsForBlock(const objects::Object& object, const core::Length& height);
 
 [[nodiscard]] extern std::optional<core::Length> getWaterSurfaceHeight(const Location& location);
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/sector.cpp b/src/engine/world/sector.cpp
index b87ca4e07..28f93e93f 100644
--- a/src/engine/world/sector.cpp
+++ b/src/engine/world/sector.cpp
@@ -21,7 +21,7 @@ namespace engine::world
 Sector::Sector(const loader::file::Sector& src,
                std::vector<Room>& rooms,
                const std::vector<Box>& boxes,
-               const engine::floordata::FloorData& newFloorData)
+               const floordata::FloorData& newFloorData)
     : box{src.boxIndex.get() >= 0 ? &boxes.at(src.boxIndex.get()) : nullptr}
     , floorHeight{src.floorHeight}
     , ceilingHeight{src.ceilingHeight}
@@ -34,7 +34,7 @@ Sector::Sector(const loader::file::Sector& src,
   {
     floorData = &src.floorDataIndex.from(newFloorData);
 
-    if(const auto boundaryRoomIndex = engine::floordata::getBoundaryRoom(floorData); boundaryRoomIndex.has_value())
+    if(const auto boundaryRoomIndex = floordata::getBoundaryRoom(floorData); boundaryRoomIndex.has_value())
     {
       boundaryRoom = &rooms.at(*boundaryRoomIndex);
     }
diff --git a/src/engine/world/sector.h b/src/engine/world/sector.h
index 79e092db4..82ea85cda 100644
--- a/src/engine/world/sector.h
+++ b/src/engine/world/sector.h
@@ -22,7 +22,7 @@ struct Room;
 
 struct Sector
 {
-  const engine::floordata::FloorDataValue* floorData = nullptr;
+  const floordata::FloorDataValue* floorData = nullptr;
   Room* boundaryRoom = nullptr;
 
   const Box* box = nullptr;
@@ -35,7 +35,7 @@ struct Sector
   Sector(const loader::file::Sector& src,
          std::vector<Room>& rooms,
          const std::vector<Box>& boxes,
-         const engine::floordata::FloorData& newFloorData);
+         const floordata::FloorData& newFloorData);
 
   void connect(std::vector<Room>& rooms);
 
diff --git a/src/engine/world/skeletalmodeltype.h b/src/engine/world/skeletalmodeltype.h
index 46a7b2e82..1a7dc8470 100644
--- a/src/engine/world/skeletalmodeltype.h
+++ b/src/engine/world/skeletalmodeltype.h
@@ -10,7 +10,7 @@
 #include <boost/assert.hpp>
 #include <cstdint>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <optional>
 #include <utility>
@@ -20,8 +20,8 @@ namespace engine::world
 {
 struct SkeletalModelType final
 {
-  core::TypeId type{uint16_t(0)};
-  core::ContainerIndex<uint16_t, gsl::not_null<const Mesh*>, gslu::nn_shared<render::scene::Mesh>> meshBaseIndex;
+  core::TypeId type{static_cast<uint16_t>(0)};
+  core::ContainerIndex<uint16_t, gsl_lite::not_null<const Mesh*>, gslu::nn_shared<render::scene::Mesh>> meshBaseIndex;
 
   struct Bone final
   {
@@ -52,4 +52,4 @@ struct SkeletalModelType final
   const loader::file::AnimFrame* frames = nullptr;
   const Animation* animations = nullptr;
 };
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/sprite.h b/src/engine/world/sprite.h
index 5cc2d3876..b8930a8bb 100644
--- a/src/engine/world/sprite.h
+++ b/src/engine/world/sprite.h
@@ -6,7 +6,7 @@
 #include <gl/soglb_fwd.h>
 #include <glm/mat4x4.hpp>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <tuple>
 
@@ -19,7 +19,7 @@ namespace engine::world
 {
 struct Sprite
 {
-  core::AtlasId atlasId{uint16_t(0)};
+  core::AtlasId atlasId{static_cast<uint16_t>(0)};
 
   glm::vec2 uv0;
   glm::vec2 uv1;
@@ -40,7 +40,7 @@ struct Sprite
 
 struct SpriteSequence
 {
-  core::TypeId type{uint16_t(0)};
-  gsl::span<const Sprite> sprites;
+  core::TypeId type{static_cast<uint16_t>(0)};
+  gsl_lite::span<const Sprite> sprites;
 };
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/texturing.cpp b/src/engine/world/texturing.cpp
index cff470cab..5949bf38e 100644
--- a/src/engine/world/texturing.cpp
+++ b/src/engine/world/texturing.cpp
@@ -35,7 +35,7 @@
 #include <glm/common.hpp>
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <limits>
 #include <map>
@@ -72,8 +72,7 @@ void remap(AtlasTile& srcTile, const core::AtlasId& newAtlasId, const glm::vec2&
   srcTile.textureKey.atlasIdAndFlag |= newAtlasId.get();
 
   const auto [tileUvMin, tileUvMax] = srcTile.getMinMaxUv();
-  const auto tileUvSize = tileUvMax - tileUvMin;
-  if(tileUvSize.x == 0 || tileUvSize.y == 0)
+  if(const auto tileUvSize = tileUvMax - tileUvMin; tileUvSize.x == 0 || tileUvSize.y == 0)
     return;
 
   for(auto& uvComponent : srcTile.uvCoordinates)
@@ -106,14 +105,14 @@ struct Tile
   // texture page, position, and size (in pixels)
   std::optional<std::tuple<size_t, glm::ivec2, glm::ivec2>> remapped;
 
-  explicit Tile(const glm::ivec2& position, const glm::ivec2& size, bool opaque)
+  explicit Tile(const glm::ivec2& position, const glm::ivec2& size, const bool opaque)
       : position{size.x >= 0 ? position.x : position.x + size.x, size.y >= 0 ? position.y : position.y + size.y}
       , size{glm::abs(size)}
       , opaque{opaque}
   {
   }
 
-  [[nodiscard]] constexpr auto getXY1() const
+  [[nodiscard]] auto getXY1() const
   {
     return position + size;
   }
@@ -361,7 +360,7 @@ void layoutAtlases(const loader::file::level::Level& level,
     bool remapped = false;
     for(auto& srcTile : atlasTiles)
     {
-      if(doneTiles.count(&srcTile) != 0)
+      if(doneTiles.contains(&srcTile))
         continue;
 
       if((srcTile.textureKey.atlasIdAndFlag & loader::file::AtlasIdMask) != atlasId)
@@ -398,7 +397,7 @@ void layoutAtlases(const loader::file::level::Level& level,
 
     for(auto& sprite : sprites)
     {
-      if(doneSprites.count(&sprite) != 0)
+      if(doneSprites.contains(&sprite))
         continue;
 
       if(sprite.atlasId.get() != atlasId)
@@ -452,7 +451,7 @@ void materializeAtlases(const loader::file::level::Level& level,
                         std::unordered_set<Sprite*>& doneSprites,
                         const std::function<void(const std::string&)>& drawLoadingScreen)
 {
-  const auto atlasUvScale = 256.0f / gsl::narrow_cast<float>(atlases.getSize());
+  const auto atlasUvScale = 256.0f / gsl_lite::narrow_cast<float>(atlases.getSize());
 
   struct SourceTile final
   {
@@ -486,12 +485,11 @@ void materializeAtlases(const loader::file::level::Level& level,
   for(auto& tile : atlasTiles)
     tilesOrderedBySize.emplace_back(&tile);
 
-  std::sort(tilesOrderedBySize.begin(),
-            tilesOrderedBySize.end(),
-            [](AtlasTile* a, AtlasTile* b)
-            {
-              return a->getArea() > b->getArea();
-            });
+  std::ranges::sort(tilesOrderedBySize,
+                    [](AtlasTile* a, AtlasTile* b)
+                    {
+                      return a->getArea() > b->getArea();
+                    });
 
   for(size_t tileId = 0; tileId < tilesOrderedBySize.size(); ++tileId)
   {
@@ -534,7 +532,7 @@ void materializeAtlases(const loader::file::level::Level& level,
     }
 
     const auto srcUvDims = tile->getMinMaxUv();
-    const auto replacementUvPos = glm::vec2{replacementPos.second} / gsl::narrow_cast<float>(atlases.getSize());
+    const auto replacementUvPos = glm::vec2{replacementPos.second} / gsl_lite::narrow_cast<float>(atlases.getSize());
     remap(*tile,
           replacementPos.first,
           replacementUvPos,
@@ -546,16 +544,15 @@ void materializeAtlases(const loader::file::level::Level& level,
   for(auto& sprite : sprites)
     spritesOrderedBySize.emplace_back(&sprite);
 
-  std::sort(spritesOrderedBySize.begin(),
-            spritesOrderedBySize.end(),
-            [](Sprite* a, Sprite* b)
-            {
-              const auto aSize = a->uv1 - a->uv0;
-              const auto aArea = glm::abs(aSize.x * aSize.y);
-              const auto bSize = b->uv1 - b->uv0;
-              const auto bArea = glm::abs(bSize.x * bSize.y);
-              return aArea > bArea;
-            });
+  std::ranges::sort(spritesOrderedBySize,
+                    [](Sprite* a, Sprite* b)
+                    {
+                      const auto aSize = a->uv1 - a->uv0;
+                      const auto aArea = glm::abs(aSize.x * aSize.y);
+                      const auto bSize = b->uv1 - b->uv0;
+                      const auto bArea = glm::abs(bSize.x * bSize.y);
+                      return aArea > bArea;
+                    });
 
   for(auto* sprite : spritesOrderedBySize)
   {
@@ -593,7 +590,7 @@ void materializeAtlases(const loader::file::level::Level& level,
     {
       replacementPos = it->second;
     }
-    const auto replacementUvPos = glm::vec2{replacementPos.second} / gsl::narrow_cast<float>(atlases.getSize());
+    const auto replacementUvPos = glm::vec2{replacementPos.second} / gsl_lite::narrow_cast<float>(atlases.getSize());
     const std::pair minMaxUv{sprite->uv0, sprite->uv1};
     remap(*sprite,
           replacementPos.first,
@@ -620,10 +617,11 @@ class DataProvider
   explicit DataProvider(gl::CImgWrapper& img)
       : m_bmp{std::make_shared<Bitmap>(
           glm::ivec2{img.width(), img.height()},
-          gsl::span{reinterpret_cast<const uint32_t*>(img.pixels().data()), img.pixels().size()})}
+          gsl_lite::span{reinterpret_cast<const uint32_t*>(img.pixels().data()), img.pixels().size()})}
       , m_current{m_bmp[0]}
   {
   }
+
   ~DataProvider() = default;
 
   [[nodiscard]] uint32_t numberOfParts() const noexcept
@@ -636,7 +634,7 @@ class DataProvider
     assert(!m_done);
 
     const auto [ptr, lines, done] = m_current->nextBlock(m_linesPerPart);
-    DataPart ret{ptr, std::max<uint32_t>(4, m_current->size().x), lines, m_offset};
+    const DataPart ret{ptr, std::max<uint32_t>(4, m_current->size().x), lines, m_offset};
 
     m_offset += m_current->size().x / 4 * lines;
 
@@ -676,7 +674,7 @@ void compressEtc2(gl::CImgWrapper& wrapper, const std::filesystem::path& output)
   for(uint32_t i = 0; i < num; i++)
   {
     futures.emplace_back(std::async(std::launch::async,
-                                    [part = dp.nextPart(), &bd]()
+                                    [part = dp.nextPart(), &bd]
                                     {
                                       bd.processRgba(
                                         part.src, part.width / 4 * part.lines, part.offset, part.width, true);
@@ -716,23 +714,23 @@ std::unique_ptr<gl::Texture2DArray<gl::PremultipliedSRGBA8>>
     if(atlases.isOnlyLayout() && std::filesystem::is_regular_file(textureSizesPath))
     {
       serialization::YAMLDocument<true> doc{textureSizesPath};
-      doc.deserialize("sizes", gsl::not_null{&level}, textureSizes);
+      doc.deserialize("sizes", gsl_lite::not_null{&level}, textureSizes);
     }
     layoutAtlases(
       level, *glidos, atlases, atlasTiles, sprites, doneTiles, doneSprites, textureSizes, drawLoadingScreen);
     if(!atlases.isOnlyLayout())
     {
       serialization::YAMLDocument<false> doc{textureSizesPath};
-      doc.serialize("sizes", gsl::not_null{&level}, textureSizes);
+      doc.serialize("sizes", gsl_lite::not_null{&level}, textureSizes);
       doc.write();
     }
   }
 
   materializeAtlases(level, atlases, atlasTiles, sprites, doneTiles, doneSprites, drawLoadingScreen);
 
-  const int textureLevels = static_cast<int>(std::log2(atlases.getSize()) + 1) / 2;
+  const int textureLevels = static_cast<int>(std::log2(atlases.getSize())) + 1;
   auto allTextures = std::make_unique<gl::Texture2DArray<gl::PremultipliedSRGBA8>>(
-    glm::ivec3{atlases.getSize(), atlases.getSize(), gsl::narrow<int>(atlases.numAtlases())},
+    glm::ivec3{atlases.getSize(), atlases.getSize(), gsl_lite::narrow<int>(atlases.numAtlases())},
     "all-textures",
     textureLevels);
 
@@ -743,7 +741,7 @@ std::unique_ptr<gl::Texture2DArray<gl::PremultipliedSRGBA8>>
     for(size_t i = 0; i < atlases.numAtlases(); ++i)
     {
       loaders.emplace_back(std::async(std::launch::async,
-                                      [i, &cacheDir, &atlases]()
+                                      [i, &cacheDir, &atlases]
                                       {
                                         const auto cacheFile = cacheDir / (std::to_string(i) + ".pvr");
                                         BOOST_LOG_TRIVIAL(info) << "Loading cache texture " << cacheFile;
@@ -766,9 +764,10 @@ std::unique_ptr<gl::Texture2DArray<gl::PremultipliedSRGBA8>>
       images.emplace_back(std::make_shared<gl::CImgWrapper>(
         reinterpret_cast<uint8_t*>(bmp->data()), bmp->size().x, bmp->size().y, false));
 
-      allTextures->assign(gsl::span{reinterpret_cast<gl::PremultipliedSRGBA8*>(bmp->data()),
-                                    gsl::narrow_cast<size_t>(bmp->size().x) * gsl::narrow_cast<size_t>(bmp->size().y)},
-                          gsl::narrow_cast<int>(i));
+      allTextures->assign(
+        gsl_lite::span{reinterpret_cast<gl::PremultipliedSRGBA8*>(bmp->data()),
+                       gsl_lite::narrow_cast<size_t>(bmp->size().x) * gsl_lite::narrow_cast<size_t>(bmp->size().y)},
+        gsl_lite::narrow_cast<int>(i));
     }
   }
   else
@@ -783,7 +782,7 @@ std::unique_ptr<gl::Texture2DArray<gl::PremultipliedSRGBA8>>
       BOOST_LOG_TRIVIAL(info) << "Saving cache texture " << cacheFile;
       compressEtc2(*images[i], cacheFile);
 
-      allTextures->assign(images[i]->asPremultipliedPixels(), gsl::narrow_cast<int>(i));
+      allTextures->assign(images[i]->asPremultipliedPixels(), gsl_lite::narrow_cast<int>(i));
     }
   }
 
@@ -791,4 +790,4 @@ std::unique_ptr<gl::Texture2DArray<gl::PremultipliedSRGBA8>>
 
   return allTextures;
 }
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/texturing.h b/src/engine/world/texturing.h
index fc9992eaa..9f089cbd3 100644
--- a/src/engine/world/texturing.h
+++ b/src/engine/world/texturing.h
@@ -44,6 +44,6 @@ inline std::filesystem::path getTextureSizesYamlPath(const std::filesystem::path
 
 inline std::filesystem::path getTextureCacheVersionFilePath(const std::filesystem::path& cacheDir)
 {
-  return cacheDir / "_cache_v2.txt";
+  return cacheDir / "_cache_v3.txt";
 }
 } // namespace engine::world
diff --git a/src/engine/world/transition.h b/src/engine/world/transition.h
index 272e0f8d9..4e65e489c 100644
--- a/src/engine/world/transition.h
+++ b/src/engine/world/transition.h
@@ -4,7 +4,7 @@
 #include "core/units.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace engine::world
 {
@@ -21,7 +21,7 @@ struct TransitionCase
 
 struct Transitions
 {
-  core::AnimStateId stateId{uint16_t(0)};
-  gsl::span<const TransitionCase> transitionCases;
+  core::AnimStateId stateId{static_cast<uint16_t>(0)};
+  gsl_lite::span<const TransitionCase> transitionCases;
 };
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/util.h b/src/engine/world/util.h
index 5d2e23999..d6cf4e522 100644
--- a/src/engine/world/util.h
+++ b/src/engine/world/util.h
@@ -22,7 +22,7 @@ inline bool isDistortedQuad(const glm::vec2& v1, const glm::vec2& v2, const glm:
   const auto e2 = v3 - v2;
   const auto e3 = v4 - v3;
   const auto e4 = v1 - v4;
-  static constexpr auto Eps = float(1e-14);
+  static constexpr auto Eps = static_cast<float>(1e-14);
   return glm::abs(glm::dot(e1, e2)) > Eps || glm::abs(glm::dot(e2, e3)) > Eps || glm::abs(glm::dot(e3, e4)) > Eps
          || glm::abs(glm::dot(e4, e1)) > Eps;
 }
diff --git a/src/engine/world/world.cpp b/src/engine/world/world.cpp
index 571cf818b..c2f507eac 100644
--- a/src/engine/world/world.cpp
+++ b/src/engine/world/world.cpp
@@ -53,7 +53,7 @@
 #include "render/rendersettings.h"
 #include "render/scene/camera.h"
 #include "render/scene/node.h"
-#include "render/scene/renderer.h"
+#include "render/scene/scenegraph.h"
 #include "room.h"
 #include "sector.h"
 #include "serialization/array.h"
@@ -79,7 +79,6 @@
 #include <boost/assert.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/range/adaptor/indexed.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <chrono>
 #include <cmath>
 #include <cstddef>
@@ -89,12 +88,13 @@
 #include <gl/pixel.h>
 #include <glm/common.hpp>
 #include <glm/gtx/norm.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <iterator>
 #include <map>
 #include <memory>
 #include <optional>
+#include <ranges>
 #include <tuple>
 #include <type_traits>
 #include <unordered_map>
@@ -107,7 +107,7 @@ namespace
 {
 void activateCommand(objects::Object& object,
                      const floordata::ActivationState& activationRequest,
-                     floordata::SequenceCondition condition)
+                     const floordata::SequenceCondition condition)
 {
   if(object.m_state.activationState.isOneshot())
     return;
@@ -146,8 +146,8 @@ void activateCommand(objects::Object& object,
 
 bool flipMapCommand(floordata::ActivationState& state,
                     const floordata::ActivationState& request,
-                    floordata::SequenceCondition condition,
-                    bool roomsAreSwapped)
+                    const floordata::SequenceCondition condition,
+                    const bool roomsAreSwapped)
 {
   if(state.isOneshot())
     return false;
@@ -178,7 +178,7 @@ bool flipMapCommand(floordata::ActivationState& state,
   return false;
 }
 
-bool evaluateLaraCondition(floordata::SequenceCondition condition,
+bool evaluateLaraCondition(const floordata::SequenceCondition condition,
                            const floordata::ActivationState& request,
                            const ObjectManager& objectManager,
                            const floordata::FloorDataValue*& floorData,
@@ -193,7 +193,7 @@ bool evaluateLaraCondition(floordata::SequenceCondition condition,
     return objectManager.getLara().m_state.location.position.Y == objectManager.getLara().m_state.floor;
   case floordata::SequenceCondition::ItemActivated:
   {
-    auto swtch = objectManager.getObject(floordata::Command{*floorData++}.parameter);
+    const auto swtch = objectManager.getObject(floordata::Command{*floorData++}.parameter);
     gsl_Assert(swtch != nullptr);
     if(!swtch->triggerSwitch(request.getTimeout()))
       return false;
@@ -203,13 +203,13 @@ bool evaluateLaraCondition(floordata::SequenceCondition condition,
   }
   case floordata::SequenceCondition::KeyUsed:
   {
-    auto key = objectManager.getObject(floordata::Command{*floorData++}.parameter);
+    const auto key = objectManager.getObject(floordata::Command{*floorData++}.parameter);
     gsl_Assert(key != nullptr);
     return key->triggerKey();
   }
   case floordata::SequenceCondition::ItemPickedUp:
   {
-    auto item = objectManager.getObject(floordata::Command{*floorData++}.parameter);
+    const auto item = objectManager.getObject(floordata::Command{*floorData++}.parameter);
     gsl_Assert(item != nullptr);
     return item->triggerPickUp();
   }
@@ -223,19 +223,19 @@ bool evaluateLaraCondition(floordata::SequenceCondition condition,
   }
 }
 
-void emitGroundBubbles(const gsl::not_null<Room*>& room, World& world)
+void emitGroundBubbles(const gsl_lite::not_null<Room*>& room, World& world)
 {
   if(!room->isWaterRoom || !room->node->isVisible())
     return;
 
-  static constexpr const size_t MaxParticlesPerSector = 3;
-  static constexpr const float EmissionProbability = 0.01f;
+  static constexpr size_t MaxParticlesPerSector = 3;
+  static constexpr float EmissionProbability = 0.01f;
 
   for(int x = 0; x < room->sectorCountX; ++x)
   {
     for(int z = 0; z < room->sectorCountZ; ++z)
     {
-      const gsl::not_null s{room->getSectorByIndex(x, z)};
+      const gsl_lite::not_null s{room->getSectorByIndex(x, z)};
       if(s->roomBelow != nullptr)
         continue;
 
@@ -248,7 +248,8 @@ void emitGroundBubbles(const gsl::not_null<Room*>& room, World& world)
         const auto pz = room->position.Z + z * core::SectorSize + util::rand15(core::SectorSize);
         const auto py = s->floorHeight;
 
-        auto particle = gsl::make_shared<BubbleParticle>(Location{room, core::TRVec{px, py, pz}}, world, true, true);
+        auto particle
+          = gsl_lite::make_shared<BubbleParticle>(Location{room, core::TRVec{px, py, pz}}, world, true, true);
         particle->scale = 0.5f;
         particle->circleRadius = 1_len;
         room->particles.registerParticle(std::move(particle));
@@ -317,7 +318,7 @@ void World::dinoStompEffect(objects::Object& object)
     return;
 
   const auto x = (100_len).cast<float>() * (1 - glm::length2(d) / util::square(MaxD));
-  m_cameraController->setBounce(x.cast<core::Length>());
+  m_cameraController->setShake(x.cast<core::Length>());
 }
 
 void World::laraNormalEffect()
@@ -325,9 +326,9 @@ void World::laraNormalEffect()
   m_objectManager.getLara().setCurrentAnimState(loader::file::LaraStateId::Stop);
   m_objectManager.getLara().setRequiredAnimState(loader::file::LaraStateId::Unknown12);
   m_objectManager.getLara().getSkeleton()->setAnim(
-    gsl::not_null{&m_worldGeometry->getAnimation(loader::file::AnimationId::STAY_SOLID)});
+    gsl_lite::not_null{&m_worldGeometry->getAnimation(loader::file::AnimationId::STAY_SOLID)});
   m_cameraController->setMode(CameraMode::Chase);
-  getPresenter().getRenderer().getCamera()->setFieldOfView(Presenter::DefaultFov);
+  m_engine->getPresenter().getRenderSystem().getCamera()->setFieldOfView(core::DefaultFov);
 }
 
 void World::laraBubblesEffect(objects::Object& object)
@@ -348,7 +349,8 @@ void World::laraBubblesEffect(objects::Object& object)
 
   while(bubbleCount-- > 0)
   {
-    auto particle = gsl::make_shared<BubbleParticle>(Location{object.m_state.location.room, position}, *this);
+    const auto particle
+      = gsl_lite::make_shared<BubbleParticle>(Location{object.m_state.location.room, position}, *this);
     setParent(particle, object.m_state.location.room->node);
     m_objectManager.registerParticle(particle);
   }
@@ -365,7 +367,7 @@ void World::earthquakeEffect()
   {
   case 0:
     m_audioEngine->playSoundEffect(TR1SoundEffect::Explosion, nullptr);
-    m_cameraController->setBounce(-250_len);
+    m_cameraController->setShake(-250_len);
     break;
   case 3:
     m_audioEngine->playSoundEffect(TR1SoundEffect::Boulder, nullptr);
@@ -395,7 +397,7 @@ void World::floodEffect()
   if(m_effectTimer <= core::FrameRate * 4_sec)
   {
     auto pos = m_objectManager.getLara().m_state.location.position;
-    core::Frame mul = 0_frame;
+    auto mul = 0_frame;
     if(m_effectTimer >= core::FrameRate * 1_sec)
     {
       mul = m_effectTimer - (core::FrameRate * 1_sec).cast<core::Frame>();
@@ -444,13 +446,13 @@ void World::stairsToSlopeEffect()
   else if(m_effectTimer == 0_frame)
   {
     m_audioEngine->playSoundEffect(TR1SoundEffect::HeavyDoorSlam, nullptr);
-    auto voice = m_audioEngine->playSoundEffect(TR1SoundEffect::FlowingAir,
-                                                m_cameraController->getLookAt().position.toRenderSystem());
+    const auto voice = m_audioEngine->playSoundEffect(TR1SoundEffect::FlowingAir,
+                                                      m_cameraController->getLookAt().position.toRenderSystem());
     m_audioEngine->getSoundEngine().getDevice().registerUpdateCallback(
       audio::FadeVolumeCallback{0.0f,
                                 std::chrono::seconds{4},
-                                gsl::not_null{voice},
-                                [this]()
+                                gsl_lite::not_null{voice},
+                                [this]
                                 {
                                   m_audioEngine->stopSoundEffect(TR1SoundEffect::FlowingAir, nullptr);
                                 }});
@@ -474,7 +476,7 @@ void World::sandEffect()
 void World::explosionEffect()
 {
   m_audioEngine->playSoundEffect(TR1SoundEffect::LowPitchedSettling, nullptr);
-  m_cameraController->setBounce(-75_len);
+  m_cameraController->setShake(-75_len);
   m_activeEffect.reset();
 }
 
@@ -519,7 +521,7 @@ void World::flickerEffect()
 void World::swapWithAlternate(Room& orig, Room& alternate)
 {
   // find any blocks in the original room and un-patch the floor heights
-  for(const auto& object : m_objectManager.getObjects() | boost::adaptors::map_values)
+  for(const auto& object : m_objectManager.getObjects() | std::views::values)
   {
     if(object->m_state.location.room != &orig)
       continue;
@@ -527,12 +529,12 @@ void World::swapWithAlternate(Room& orig, Room& alternate)
     if(const auto block = std::dynamic_pointer_cast<objects::Block>(object.get()); block != nullptr)
     {
       patchHeightsForBlock(*block, 1_sectors);
-      block->getSkeleton()->resetInterpolation();
+      block->getSkeleton()->resetSmoothing();
     }
     else if(const auto tallBlock = std::dynamic_pointer_cast<objects::TallBlock>(object.get()); tallBlock != nullptr)
     {
       patchHeightsForBlock(*tallBlock, 2_sectors);
-      tallBlock->getSkeleton()->resetInterpolation();
+      tallBlock->getSkeleton()->resetSmoothing();
     }
   }
 
@@ -549,16 +551,16 @@ void World::swapWithAlternate(Room& orig, Room& alternate)
   // patch heights in the new room, and swap object ownerships.
   // note that this is exactly the same code as above,
   // except for the heights.
-  for(const auto& object : m_objectManager.getObjects() | boost::adaptors::map_values)
+  for(const auto& object : m_objectManager.getObjects() | std::views::values)
   {
     if(object->m_state.location.room == &orig)
     {
       // although this seems contradictory, remember the nodes have been swapped above
-      setParent(gsl::not_null{object->getNode()}, orig.node);
+      setParent(gsl_lite::not_null{object->getNode()}, orig.node);
     }
     else if(object->m_state.location.room == &alternate)
     {
-      setParent(gsl::not_null{object->getNode()}, alternate.node);
+      setParent(gsl_lite::not_null{object->getNode()}, alternate.node);
       continue;
     }
     else
@@ -569,12 +571,12 @@ void World::swapWithAlternate(Room& orig, Room& alternate)
     if(const auto block = std::dynamic_pointer_cast<objects::Block>(object.get()); block != nullptr)
     {
       patchHeightsForBlock(*block, -1_sectors);
-      block->getSkeleton()->resetInterpolation();
+      block->getSkeleton()->resetSmoothing();
     }
     else if(const auto tallBlock = std::dynamic_pointer_cast<objects::TallBlock>(object.get()))
     {
       patchHeightsForBlock(*tallBlock, -2_sectors);
-      tallBlock->getSkeleton()->resetInterpolation();
+      tallBlock->getSkeleton()->resetSmoothing();
     }
   }
 
@@ -582,21 +584,22 @@ void World::swapWithAlternate(Room& orig, Room& alternate)
   {
     if(object->m_state.location.room == &orig)
     {
-      setParent(gsl::not_null{object->getNode()}, orig.node);
+      setParent(gsl_lite::not_null{object->getNode()}, orig.node);
     }
     else if(object->m_state.location.room == &alternate)
     {
-      setParent(gsl::not_null{object->getNode()}, alternate.node);
+      setParent(gsl_lite::not_null{object->getNode()}, alternate.node);
     }
   }
 }
 
-gslu::nn_shared<objects::PickupObject>
-  World::createPickup(const core::TypeId& type, const gsl::not_null<const Room*>& room, const core::TRVec& position)
+gslu::nn_shared<objects::PickupObject> World::createPickup(const core::TypeId& type,
+                                                           const gsl_lite::not_null<const Room*>& room,
+                                                           const core::TRVec& position)
 {
   loader::file::Item item;
   item.type = type;
-  item.room = uint16_t(-1);
+  item.room = static_cast<uint16_t>(-1);
   item.position = position;
   item.rotation = 0_deg;
   item.shade = core::Shade{core::Shade::type{0}};
@@ -606,15 +609,15 @@ gslu::nn_shared<objects::PickupObject>
   gsl_Assert(spriteSequence != nullptr && !spriteSequence->sprites.empty());
   const Sprite& sprite = spriteSequence->sprites[0];
 
-  auto object = gsl::make_shared<objects::PickupObject>(
+  auto object = gsl_lite::make_shared<objects::PickupObject>(
     objects::makeObjectName(item.type.get_as<TR1ItemId>(), m_objectManager.getDynamicObjectCount()),
-    gsl::not_null{this},
+    gsl_lite::not_null{this},
     room,
     item,
-    gsl::not_null{&sprite});
+    gsl_lite::not_null{&sprite});
 
   m_objectManager.registerDynamicObject(object);
-  addChild(gsl::not_null{room->node}, gsl::not_null{object->getNode()});
+  addChild(gsl_lite::not_null{room->node}, gsl_lite::not_null{object->getNode()});
 
   return object;
 }
@@ -632,14 +635,14 @@ const std::vector<CinematicFrame>& World::getCinematicFrames() const noexcept
   return m_cinematicFrames;
 }
 
-void World::update(const bool godMode)
+void World::updateLogicWorldState(const bool godMode)
 {
-  m_objectManager.update(*this, godMode);
+  m_objectManager.updateLogic(*this, godMode);
   if(const auto lara = m_objectManager.getLaraPtr();
      getEngine().getEngineConfig()->lowHealthMonochrome && lara != nullptr)
   {
-    const auto newStrength = 1 - lara->m_state.health.cast<float>() / core::LaraHealth * 5;
-    if(newStrength < m_currentDeathStrength)
+    if(const auto newStrength = 1 - lara->m_state.health.cast<float>() / core::LaraHealth * 5;
+       newStrength < m_currentDeathStrength)
       m_currentDeathStrength = std::max(m_currentDeathStrength - DeathStrengthFadeDeltaPerFrame, newStrength);
     else if(newStrength > m_currentDeathStrength)
       m_currentDeathStrength = std::min(m_currentDeathStrength + DeathStrengthFadeDeltaPerFrame, newStrength);
@@ -649,7 +652,7 @@ void World::update(const bool godMode)
   {
     m_currentDeathStrength = 0;
   }
-  getPresenter().getMaterialManager()->setDeathStrength(m_currentDeathStrength);
+  m_engine->getPresenter().getRenderSystem().getMaterialManager().setDeathStrength(m_currentDeathStrength);
 
   static constexpr auto UVAnimTime = core::FrameRate * 1_sec / 3;
 
@@ -663,15 +666,13 @@ void World::update(const bool godMode)
     m_uvAnimTime -= UVAnimTime;
   }
 
-  m_pickupWidgets.erase(std::remove_if(m_pickupWidgets.begin(),
-                                       m_pickupWidgets.end(),
-                                       [](const ui::PickupWidget& w)
-                                       {
-                                         return w.expired();
-                                       }),
-                        m_pickupWidgets.end());
+  std::erase_if(m_pickupWidgets,
+                [](const ui::PickupWidget& w)
+                {
+                  return w.expired();
+                });
   for(auto& w : m_pickupWidgets)
-    w.nextFrame();
+    w.tick();
 
   m_audioEngine->cleanup();
 }
@@ -810,7 +811,7 @@ void World::handleCommandSequence(const floordata::FloorDataValue* floorData, co
     {
       const auto& sink = m_cameraSinks.at(command.parameter);
       {
-        m_objectManager.getLara().m_underwaterRoute.setTargetBox(gsl::not_null{&m_boxes.at(sink.box_index)});
+        m_objectManager.getLara().m_underwaterRoute.setTargetBox(gsl_lite::not_null{&m_boxes.at(sink.box_index)});
         auto newTarget = sink.position;
         newTarget.X = m_boxes[sink.box_index].xInterval.clamp(newTarget.X);
         newTarget.Z = m_boxes[sink.box_index].zInterval.clamp(newTarget.Z);
@@ -833,7 +834,10 @@ void World::handleCommandSequence(const floordata::FloorDataValue* floorData, co
       break;
     case floordata::CommandOpcode::FlipOff:
       BOOST_ASSERT(command.parameter < m_mapFlipActivationStates.size());
-      if(m_roomsAreSwapped && m_mapFlipActivationStates[command.parameter].isFullyActivated())
+      if(m_roomsAreSwapped
+         && m_mapFlipActivationStates[command.parameter]
+
+              .isFullyActivated())
         swapRooms = true;
       break;
     case floordata::CommandOpcode::FlipEffect:
@@ -870,7 +874,7 @@ void World::handleCommandSequence(const floordata::FloorDataValue* floorData, co
     if(m_cameraController->getMode() == CameraMode::FixedPosition
        || m_cameraController->getMode() == CameraMode::HeavyFixedPosition)
     {
-      m_cameraController->setLookAtObject(gsl::not_null{lookAtObject});
+      m_cameraController->setLookAtObject(gsl_lite::not_null{lookAtObject});
     }
   }
 
@@ -886,13 +890,12 @@ void World::handleCommandSequence(const floordata::FloorDataValue* floorData, co
 void World::serialize(const serialization::Serializer<World>& ser) const
 {
   std::vector<size_t> physicalIds;
-  std::transform(m_rooms.begin(),
-                 m_rooms.end(),
-                 std::back_inserter(physicalIds),
-                 [](const Room& room)
-                 {
-                   return room.physicalId;
-                 });
+  std::ranges::transform(m_rooms,
+                         std::back_inserter(physicalIds),
+                         [](const Room& room)
+                         {
+                           return room.physicalId;
+                         });
 
   ser(S_NV("objectManager", m_objectManager),
       S_NV("player", *m_player),
@@ -915,19 +918,18 @@ void World::serialize(const serialization::Serializer<World>& ser) const
 void World::deserialize(const serialization::Deserializer<World>& ser)
 {
   std::vector<size_t> physicalIds;
-  std::transform(m_rooms.begin(),
-                 m_rooms.end(),
-                 std::back_inserter(physicalIds),
-                 [](const Room& room)
-                 {
-                   return room.physicalId;
-                 });
-
-  getPresenter().getRenderer().getRootNode()->clear();
+  std::ranges::transform(m_rooms,
+                         std::back_inserter(physicalIds),
+                         [](const Room& room)
+                         {
+                           return room.physicalId;
+                         });
+
+  m_engine->getPresenter().getRenderSystem().getSceneGraph().getRootNode()->clear();
   for(auto& room : m_rooms)
   {
     room.resetScenery();
-    setParent(gsl::not_null{room.node}, getPresenter().getRenderer().getRootNode());
+    setParent(gsl_lite::not_null{room.node}, m_engine->getPresenter().getRenderSystem().getSceneGraph().getRootNode());
   }
 
   ser(S_NV("roomPhysicalIds", serialization::DeserializingFrozenVector{std::ref(physicalIds)}));
@@ -962,13 +964,11 @@ void World::deserialize(const serialization::Deserializer<World>& ser)
   updateStaticSoundEffects();
 }
 
-void World::gameLoop(bool godMode, float blackAlpha, ui::Ui& ui)
+void World::updateGameLogic(const bool godMode)
 {
-  update(godMode);
+  updateLogicWorldState(godMode);
   m_player->laraHealth = m_objectManager.getLara().m_state.health;
 
-  const auto waterEntryPortals = m_cameraController->update();
-
   for(const auto& room : m_rooms)
   {
     std::vector<std::shared_ptr<Particle>> particlesToErase;
@@ -985,81 +985,71 @@ void World::gameLoop(bool godMode, float blackAlpha, ui::Ui& ui)
   }
 
   doGlobalEffect();
-  getPresenter().drawBars(
-    ui, m_worldGeometry->getPalette(), getObjectManager(), getEngine().getEngineConfig()->pulseLowHealthHealthBar);
-
-  drawPickupWidgets(ui);
-  if(const auto lara = getObjectManager().getLaraPtr())
-    lara->m_state.location.room->node->setVisible(true);
-  getPresenter().renderWorld(getRooms(), getCameraController(), waterEntryPortals, *this);
-  getPresenter().renderScreenOverlay();
-  if(blackAlpha > 0)
-  {
-    ui.drawBox({0, 0}, ui.getSize(), gl::SRGBA8{0, 0, 0, gsl::narrow_cast<uint8_t>(255 * blackAlpha)});
-  }
-
-  getPresenter().renderUi(ui, 1);
-  getPresenter().updateSoundEngine();
-  getPresenter().swapBuffers();
 
   if(m_engine->getEngineConfig()->waterBedBubbles)
   {
     for(auto& room : m_rooms)
     {
-      emitGroundBubbles(gsl::not_null{&room}, *this);
+      emitGroundBubbles(gsl_lite::not_null{&room}, *this);
     }
   }
+
+  m_cameraController->updateGameLogic(true);
 }
 
-bool World::cinematicLoop()
+bool World::tickCinematic()
 {
-  m_cameraController->m_cinematicFrame += 1_frame;
-  if(gsl::narrow<size_t>(m_cameraController->m_cinematicFrame.get()) >= m_cinematicFrames.size())
+  if(!m_cameraController->tickCinematic(m_cinematicFrames, false))
     return false;
+  doGlobalEffect();
+  return true;
+}
 
-  update(false);
-  getPresenter().getMaterialManager()->setDeathStrength(0);
+void World::renderCinematic() const
+{
+  m_engine->getPresenter().getRenderSystem().getMaterialManager().setDeathStrength(0);
 
-  const auto waterEntryPortals
-    = m_cameraController->updateCinematic(m_cinematicFrames.at(m_cameraController->m_cinematicFrame.get()), false);
-  doGlobalEffect();
+  for(const auto& val : m_objectManager.getObjects() | std::views::values)
+  {
+    if(const auto node = val->getNode(); node != nullptr)
+      node->setVisible(true);
+  }
 
-  ui::Ui ui{
-    getPresenter().getMaterialManager()->getUi(), m_worldGeometry->getPalette(), getPresenter().getUiViewport()};
-  getPresenter().renderWorld(getRooms(), getCameraController(), waterEntryPortals, *this);
-  getPresenter().renderScreenOverlay();
-  getPresenter().renderUi(ui, 1);
-  getPresenter().updateSoundEngine();
-  getPresenter().swapBuffers();
-  return true;
+  for(const auto& room : m_rooms)
+  {
+    room.node->setVisible(true);
+  }
+
+  m_engine->getPresenter().renderWorldGeometryFramebuffers(
+    m_rooms, *m_cameraController, m_cameraController->getWaterEntryPortals(), *this);
 }
 
 void World::load(const std::optional<size_t>& slot)
 {
-  getPresenter().drawLoadingScreen(_("Loading..."));
+  m_engine->getPresenter().drawLoadingScreen(_("Loading..."));
   const auto filename = m_engine->getSavegamePath(slot);
   BOOST_LOG_TRIVIAL(info) << "Load " << filename;
   serialization::YAMLDocument<true> doc{filename};
   SavegameMeta meta{};
-  doc.deserialize("meta", gsl::not_null{&meta}, meta);
+  doc.deserialize("meta", gsl_lite::not_null{&meta}, meta);
   if(!util::preferredEqual(meta.filename, std::filesystem::relative(m_levelFilename, m_engine->getAssetDataPath())))
   {
     BOOST_LOG_TRIVIAL(error) << "Savegame mismatch. File is for " << meta.filename << ", but current level is "
                              << m_levelFilename;
     return;
   }
-  doc.deserialize("data", gsl::not_null{this}, *this);
+  doc.deserialize("data", gsl_lite::not_null{this}, *this);
 
   {
     GameplayRules rules{};
-    doc.deserialize("gameplayRules", gsl::not_null{this}, rules);
+    doc.deserialize("gameplayRules", gsl_lite::not_null{this}, rules);
     m_engine->setGameplayRules(rules);
   }
 
   m_objectManager.getLara().m_state.health = m_player->laraHealth;
   m_objectManager.getLara().initWeaponAnimData();
   connectSectors();
-  getPresenter().disableScreenOverlay();
+  m_engine->getPresenter().disableScreenOverlay();
 
   m_engine->onGameSavedOrLoaded();
 }
@@ -1069,13 +1059,13 @@ void World::save(const std::filesystem::path& filename)
   BOOST_LOG_TRIVIAL(info) << "Save " << filename;
   serialization::YAMLDocument<false> doc{filename};
   SavegameMeta meta{std::filesystem::relative(m_levelFilename, m_engine->getAssetDataPath()).string()};
-  doc.serialize("meta", gsl::not_null{&meta}, meta);
-  doc.serialize("data", gsl::not_null{this}, *this);
-  doc.serialize("gameplayRules", gsl::not_null{this}, m_engine->getGameplayRules());
+  doc.serialize("meta", gsl_lite::not_null{&meta}, meta);
+  doc.serialize("data", gsl_lite::not_null{this}, *this);
+  doc.serialize("gameplayRules", gsl_lite::not_null{this}, m_engine->getGameplayRules());
   doc.write();
 
   serialization::YAMLDocument<false> metaCacheDoc{makeMetaFilepath(filename)};
-  metaCacheDoc.serialize("meta", gsl::not_null{&meta}, meta);
+  metaCacheDoc.serialize("meta", gsl_lite::not_null{&meta}, meta);
   metaCacheDoc.write();
 
   m_engine->onGameSavedOrLoaded();
@@ -1085,7 +1075,7 @@ void World::save(const std::optional<size_t>& slot)
 {
   const auto filename = m_engine->getSavegamePath(slot);
   save(filename);
-  getPresenter().disableScreenOverlay();
+  m_engine->getPresenter().disableScreenOverlay();
 }
 
 std::tuple<std::optional<SavegameInfo>, std::map<size_t, SavegameInfo>> World::getSavedGames() const
@@ -1100,15 +1090,15 @@ std::tuple<std::optional<SavegameInfo>, std::map<size_t, SavegameInfo>> World::g
     {
       serialization::YAMLDocument<true> metaCacheDoc{metaPath};
       SavegameMeta meta{};
-      metaCacheDoc.deserialize("meta", gsl::not_null{&meta}, meta);
+      metaCacheDoc.deserialize("meta", gsl_lite::not_null{&meta}, meta);
       return SavegameInfo{std::move(meta), std::filesystem::last_write_time(path)};
     }
 
     serialization::YAMLDocument<true> doc{path};
     SavegameMeta meta{};
-    doc.deserialize("meta", gsl::not_null{&meta}, meta);
+    doc.deserialize("meta", gsl_lite::not_null{&meta}, meta);
     serialization::YAMLDocument<false> newMetaCacheDoc{metaPath};
-    newMetaCacheDoc.serialize("meta", gsl::not_null{&meta}, meta);
+    newMetaCacheDoc.serialize("meta", gsl_lite::not_null{&meta}, meta);
     newMetaCacheDoc.write();
     return SavegameInfo{std::move(meta), std::filesystem::last_write_time(path)};
   };
@@ -1130,8 +1120,7 @@ bool World::hasSavedGames() const
 
   for(size_t i = 0; i < core::SavegameSlots; ++i)
   {
-    const auto path = m_engine->getSavegamePath(i);
-    if(!std::filesystem::is_regular_file(path))
+    if(const auto path = m_engine->getSavegamePath(i); !std::filesystem::is_regular_file(path))
       continue;
 
     return true;
@@ -1139,28 +1128,28 @@ bool World::hasSavedGames() const
   return false;
 }
 
-World::World(const gsl::not_null<Engine*>& engine,
+World::World(const gsl_lite::not_null<Engine*>& engine,
              std::unique_ptr<loader::file::level::Level>&& level,
              std::string title,
              const std::optional<TR1TrackId>& ambient,
-             bool useAlternativeLara,
+             const bool useAlternativeLara,
              std::unordered_map<std::string, std::unordered_map<TR1ItemId, std::string>> itemTitles,
              std::shared_ptr<Player> player,
              std::shared_ptr<Player> levelStartPlayer,
-             bool fromSave,
+             const bool fromSave,
              std::shared_ptr<WorldGeometry>&& worldGeometry,
              const std::filesystem::path& worldGeometryCacheKey)
     : m_engine{engine}
     , m_levelFilename{level->getFilename()}
     , m_audioEngine{std::make_unique<AudioEngine>(
-        gsl::not_null{this}, engine->getAssetDataPath(), engine->getPresenter().getSoundEngine())}
+        gsl_lite::not_null{this}, engine->getAssetDataPath(), engine->getPresenter().getSoundEngine())}
     , m_title{std::move(title)}
     , m_itemTitles{std::move(itemTitles)}
     , m_player{std::move(player)}
     , m_levelStartPlayer{std::move(levelStartPlayer)}
     , m_samplesData{std::move(level->m_samplesData)}
     , m_worldGeometry{worldGeometry != nullptr ? std::move(worldGeometry)
-                                               : gsl::make_shared<WorldGeometry>(*m_engine, *level)}
+                                               : gsl_lite::make_shared<WorldGeometry>(*m_engine, *level)}
 {
   m_engine->setWorldGeometryCache(worldGeometryCacheKey, m_worldGeometry);
   m_engine->registerWorld(this);
@@ -1173,10 +1162,10 @@ World::World(const gsl::not_null<Engine*>& engine,
 
   for(const auto offset : level->m_sampleIndices)
   {
-    m_audioEngine->addWav(gsl::not_null{&m_samplesData.at(offset)});
+    m_audioEngine->addWav(gsl_lite::not_null{&m_samplesData.at(offset)});
   }
 
-  getPresenter().drawLoadingScreen(util::unescape(m_title));
+  m_engine->getPresenter().drawLoadingScreen(util::unescape(m_title));
 
   initFromLevel(*level, fromSave);
 
@@ -1185,24 +1174,24 @@ World::World(const gsl::not_null<Engine*>& engine,
     useAlternativeLaraAppearance();
   }
 
-  getPresenter().getSoundEngine()->setListener(m_cameraController.get());
-  getPresenter().setTrFont(
+  m_engine->getPresenter().getSoundEngine()->setListener(m_cameraController.get());
+  m_engine->getPresenter().setTrFont(
     std::make_unique<ui::TRFont>(*m_worldGeometry->getSpriteSequences().at(TR1ItemId::FontGraphics)));
   if(ambient.has_value())
   {
     m_audioEngine->playStopCdTrack(m_engine->getScriptEngine().getGameflow(), *ambient, false);
   }
-  getPresenter().disableScreenOverlay();
+  m_engine->getPresenter().disableScreenOverlay();
 
   m_engine->onGameSavedOrLoaded();
 }
 
 World::~World()
 {
-  m_engine->unregisterWorld(gsl::not_null{this});
+  m_engine->unregisterWorld(gsl_lite::not_null{this});
 }
 
-void World::drawPickupWidgets(ui::Ui& ui)
+void World::constructPickupWidgets(ui::Ui& ui)
 {
   auto x = ui.getSize().x;
   const auto y = ui.getSize().y * 9 / 10;
@@ -1214,7 +1203,7 @@ void World::drawPickupWidgets(ui::Ui& ui)
     if(widget.expired())
       continue;
 
-    x -= std::lround(gsl::narrow_cast<float>(widget.getWidth()) * WidgetScale);
+    x -= std::lround(gsl_lite::narrow_cast<float>(widget.getWidth()) * WidgetScale);
     widget.draw(ui, x, y, m_engine->getPresenter().getTrFont(), WidgetScale);
   }
 }
@@ -1229,18 +1218,18 @@ Presenter& World::getPresenter()
   return m_engine->getPresenter();
 }
 
-std::optional<std::string> World::getItemTitle(TR1ItemId id) const
+std::optional<std::string> World::getItemTitle(const TR1ItemId id) const
 {
-  if(auto langIt = m_itemTitles.find(m_engine->getLocaleWithoutEncoding()); langIt != m_itemTitles.end())
+  if(const auto langIt = m_itemTitles.find(m_engine->getLocaleWithoutEncoding()); langIt != m_itemTitles.end())
   {
-    if(auto itemIt = langIt->second.find(id); itemIt != langIt->second.end())
+    if(const auto itemIt = langIt->second.find(id); itemIt != langIt->second.end())
     {
       return itemIt->second;
     }
   }
-  if(auto langIt = m_itemTitles.find("en_GB"); langIt != m_itemTitles.end())
+  if(const auto langIt = m_itemTitles.find("en_GB"); langIt != m_itemTitles.end())
   {
-    if(auto itemIt = langIt->second.find(id); itemIt != langIt->second.end())
+    if(const auto itemIt = langIt->second.find(id); itemIt != langIt->second.end())
     {
       return itemIt->second;
     }
@@ -1249,7 +1238,7 @@ std::optional<std::string> World::getItemTitle(TR1ItemId id) const
   return std::nullopt;
 }
 
-void World::initFromLevel(loader::file::level::Level& level, bool fromSave)
+void World::initFromLevel(loader::file::level::Level& level, const bool fromSave)
 {
   BOOST_LOG_TRIVIAL(info) << "Pre-flight checks for " << m_levelFilename.stem();
   for(const auto& idItem : level.m_items | boost::adaptors::indexed())
@@ -1266,8 +1255,8 @@ void World::initFromLevel(loader::file::level::Level& level, bool fromSave)
     const auto& room = level.m_rooms[item.room.get()];
     const auto inRoom = item.position - room.position;
     const auto sectorX = sectorOf(inRoom.X);
-    const auto sectorZ = sectorOf(inRoom.Z);
-    if(sectorX < 1 || sectorX >= room.sectorCountX - 1 || sectorZ < 1 || sectorZ >= room.sectorCountZ - 1)
+    if(const auto sectorZ = sectorOf(inRoom.Z);
+       sectorX < 1 || sectorX >= room.sectorCountX - 1 || sectorZ < 1 || sectorZ >= room.sectorCountZ - 1)
     {
       BOOST_LOG_TRIVIAL(warning) << "invalid item #" << i << "(" << toString(item.type.get_as<TR1ItemId>())
                                  << "): horizontally out of bounds";
@@ -1315,7 +1304,7 @@ void World::initStaticSoundEffects(const loader::file::level::Level& level)
   for(const loader::file::SoundSource& src : level.m_soundSources)
   {
     m_positionalEmitters.emplace_back(src.position.toRenderSystem(),
-                                      gsl::not_null{getPresenter().getSoundEngine().get()});
+                                      gsl_lite::not_null{m_engine->getPresenter().getSoundEngine().get().get()});
     auto voice = m_audioEngine->playSoundEffect(src.sound_effect_id, &m_positionalEmitters.back());
     gsl_Assert(voice != nullptr);
     voice->pause();
@@ -1330,10 +1319,10 @@ void World::initCameraController()
 {
   if(m_objectManager.getLaraPtr() == nullptr)
   {
-    m_cameraController
-      = std::make_unique<CameraController>(gsl::not_null{this}, getPresenter().getRenderer().getCamera(), true);
+    m_cameraController = std::make_unique<CameraController>(
+      gsl_lite::not_null{this}, m_engine->getPresenter().getRenderSystem().getCamera(), true);
 
-    for(const auto& item : m_objectManager.getObjects() | boost::adaptors::map_values)
+    for(const auto& item : m_objectManager.getObjects() | std::views::values)
     {
       if(item->m_state.type == TR1ItemId::CutsceneActor1)
       {
@@ -1343,8 +1332,8 @@ void World::initCameraController()
   }
   else
   {
-    m_cameraController
-      = std::make_unique<CameraController>(gsl::not_null{this}, getPresenter().getRenderer().getCamera());
+    m_cameraController = std::make_unique<CameraController>(gsl_lite::not_null{this},
+                                                            m_engine->getPresenter().getRenderSystem().getCamera());
   }
 }
 
@@ -1366,24 +1355,22 @@ void World::countSecrets()
 
 void World::initCameras(const loader::file::level::Level& level)
 {
-  std::transform(level.m_cameras.begin(),
-                 level.m_cameras.end(),
-                 std::back_inserter(m_cameraSinks),
-                 [](const loader::file::Camera& camera)
-                 {
-                   return CameraSink{camera.position, {camera.room}, {camera.flags}};
-                 });
+  std::ranges::transform(level.m_cameras,
+                         std::back_inserter(m_cameraSinks),
+                         [](const loader::file::Camera& camera)
+                         {
+                           return CameraSink{camera.position, {camera.room}, {camera.flags}};
+                         });
 }
 
 void World::initCinematicFrames(const loader::file::level::Level& level)
 {
-  std::transform(level.m_cinematicFrames.begin(),
-                 level.m_cinematicFrames.end(),
-                 std::back_inserter(m_cinematicFrames),
-                 [](const loader::file::CinematicFrame& frame) noexcept
-                 {
-                   return CinematicFrame{frame.lookAt, frame.position, toRad(frame.fov), toRad(frame.rotZ)};
-                 });
+  std::ranges::transform(level.m_cinematicFrames,
+                         std::back_inserter(m_cinematicFrames),
+                         [](const loader::file::CinematicFrame& frame) noexcept
+                         {
+                           return CinematicFrame{frame.lookAt, frame.position, toRad(frame.fov), toRad(frame.rotZ)};
+                         });
 }
 
 void World::initRooms(const loader::file::level::Level& level)
@@ -1399,27 +1386,25 @@ void World::initRooms(const loader::file::level::Level& level)
   for(size_t i = 0; i < m_rooms.size(); ++i)
   {
     const auto& srcRoom = level.m_rooms.at(i);
-    std::transform(srcRoom.sectors.begin(),
-                   srcRoom.sectors.end(),
-                   std::back_inserter(m_rooms[i].sectors),
-                   [this](const loader::file::Sector& sector)
-                   {
-                     return Sector{sector, m_rooms, m_boxes, m_floorData};
-                   });
+    std::ranges::transform(srcRoom.sectors,
+                           std::back_inserter(m_rooms[i].sectors),
+                           [this](const loader::file::Sector& sector)
+                           {
+                             return Sector{sector, m_rooms, m_boxes, m_floorData};
+                           });
     gsl_Assert(srcRoom.sectors.size() == m_rooms[i].sectors.size());
-    std::transform(srcRoom.lights.begin(),
-                   srcRoom.lights.end(),
-                   std::back_inserter(m_rooms[i].lights),
-                   [](const loader::file::Light& light)
-                   {
-                     return Light{light.position, light.intensity, light.fadeDistance};
-                   });
+    std::ranges::transform(srcRoom.lights,
+                           std::back_inserter(m_rooms[i].lights),
+                           [](const loader::file::Light& light)
+                           {
+                             return Light{light.position, light.intensity, light.fadeDistance};
+                           });
     for(const auto& rsm : srcRoom.staticMeshes)
     {
       if(const auto mesh = m_worldGeometry->findStaticMeshById(rsm.meshId); mesh != nullptr)
       {
         m_rooms[i].staticMeshes.emplace_back(
-          RoomStaticMesh{rsm.position, rsm.rotation, rsm.shade, gsl::not_null{mesh}});
+          RoomStaticMesh{rsm.position, rsm.rotation, rsm.shade, gsl_lite::not_null{mesh}});
       }
       else
       {
@@ -1428,21 +1413,24 @@ void World::initRooms(const loader::file::level::Level& level)
     }
     m_rooms[i].alternateRoom = srcRoom.alternateRoom.get() >= 0 ? &m_rooms.at(srcRoom.alternateRoom.get()) : nullptr;
 
-    m_rooms[i].createSceneNode(
-      level.m_rooms.at(i), *this, level.m_animatedTextures, *getPresenter().getMaterialManager());
-    setParent(gsl::not_null{m_rooms[i].node}, getPresenter().getRenderer().getRootNode());
+    m_rooms[i].createSceneNode(level.m_rooms.at(i),
+                               *this,
+                               level.m_animatedTextures,
+                               m_engine->getPresenter().getRenderSystem().getMaterialManager());
+    setParent(gsl_lite::not_null{m_rooms[i].node},
+              m_engine->getPresenter().getRenderSystem().getSceneGraph().getRootNode());
   }
 }
 
 void World::initBoxes(const loader::file::level::Level& level)
 {
   m_boxes.resize(level.m_boxes.size());
-  auto getOverlaps = [this, &level](const uint16_t idx) -> std::vector<gsl::not_null<Box*>>
+  auto getOverlaps = [this, &level](const uint16_t idx) -> std::vector<gsl_lite::not_null<Box*>>
   {
     if(idx >= level.m_overlaps.size())
       return {};
 
-    std::vector<gsl::not_null<Box*>> result;
+    std::vector<gsl_lite::not_null<Box*>> result;
     const auto first = &level.m_overlaps.at(idx);
     auto current = first;
     const auto endOfUniverse = &level.m_overlaps.back() + 1;
@@ -1457,18 +1445,17 @@ void World::initBoxes(const loader::file::level::Level& level)
     return result;
   };
 
-  std::transform(level.m_boxes.begin(),
-                 level.m_boxes.end(),
-                 m_boxes.begin(),
-                 [&getOverlaps](const loader::file::Box& box)
-                 {
-                   return Box{{box.xmin, box.xmax},
-                              {box.zmin, box.zmax},
-                              box.floor,
-                              box.blocked,
-                              box.blockable,
-                              getOverlaps(box.overlap_index)};
-                 });
+  std::ranges::transform(level.m_boxes,
+                         m_boxes.begin(),
+                         [&getOverlaps](const loader::file::Box& box)
+                         {
+                           return Box{{box.xmin, box.xmax},
+                                      {box.zmin, box.zmax},
+                                      box.floor,
+                                      box.blocked,
+                                      box.blockable,
+                                      getOverlaps(box.overlap_index)};
+                         });
   gsl_Ensures(m_boxes.size() == level.m_boxes.size());
 
   gsl_Assert(level.m_baseZones.flyZone.size() == m_boxes.size());
@@ -1523,4 +1510,4 @@ void World::hitLara(const core::Health& damage)
 {
   m_objectManager.getLara().m_state.hitLara(damage, m_engine->getGameplayRules().noHits);
 }
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/world.h b/src/engine/world/world.h
index 6f7e45f24..a6350874e 100644
--- a/src/engine/world/world.h
+++ b/src/engine/world/world.h
@@ -28,7 +28,7 @@
 #include <cstdint>
 #include <filesystem>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 #include <memory>
@@ -88,7 +88,7 @@ namespace engine::world
 class World final
 {
 public:
-  explicit World(const gsl::not_null<Engine*>& engine,
+  explicit World(const gsl_lite::not_null<Engine*>& engine,
                  std::unique_ptr<loader::file::level::Level>&& level,
                  std::string title,
                  const std::optional<TR1TrackId>& ambient,
@@ -145,7 +145,7 @@ class World final
 
   template<typename T>
   std::shared_ptr<T> createDynamicObject(const core::TypeId& type,
-                                         const gsl::not_null<const Room*>& room,
+                                         const gsl_lite::not_null<const Room*>& room,
                                          const core::Angle& angle,
                                          const core::TRVec& position,
                                          const uint16_t activationState)
@@ -156,21 +156,21 @@ class World final
 
     loader::file::Item item;
     item.type = type;
-    item.room = uint16_t(-1);
+    item.room = static_cast<uint16_t>(-1);
     item.position = position;
     item.rotation = angle;
     item.shade = core::Shade{core::Shade::type{0}};
     item.activationState = activationState;
 
-    auto object
-      = gsl::make_shared<T>(objects::makeObjectName(type.get_as<TR1ItemId>(), m_objectManager.getDynamicObjectCount()),
-                            gsl::not_null{this},
-                            room,
-                            item,
-                            gsl::not_null{model.get()});
+    auto object = gsl_lite::make_shared<T>(
+      objects::makeObjectName(type.get_as<TR1ItemId>(), m_objectManager.getDynamicObjectCount()),
+      gsl_lite::not_null{this},
+      room,
+      item,
+      gsl_lite::not_null{model.get()});
 
     m_objectManager.registerDynamicObject(object);
-    addChild(gsl::not_null{room->node}, gsl::not_null{object->getNode()});
+    addChild(gsl_lite::not_null{room->node}, gsl_lite::not_null{object->getNode()});
 
     return object;
   }
@@ -191,7 +191,7 @@ class World final
   [[nodiscard]] const std::vector<Room>& getRooms() const noexcept;
   std::vector<Room>& getRooms() noexcept;
   [[nodiscard]] const std::vector<CinematicFrame>& getCinematicFrames() const noexcept;
-  void update(bool godMode);
+  void updateLogicWorldState(bool godMode);
   void dinoStompEffect(objects::Object& object);
   void laraNormalEffect();
   void laraBubblesEffect(objects::Object& object);
@@ -209,7 +209,7 @@ class World final
   void flickerEffect();
   void doGlobalEffect();
   gslu::nn_shared<objects::PickupObject>
-    createPickup(const core::TypeId& type, const gsl::not_null<const Room*>& room, const core::TRVec& position);
+    createPickup(const core::TypeId& type, const gsl_lite::not_null<const Room*>& room, const core::TRVec& position);
   void useAlternativeLaraAppearance(bool withHead = false);
   void runEffect(size_t id, objects::Object* object);
   void turn180Effect(objects::Object& object) noexcept;
@@ -217,8 +217,9 @@ class World final
   void handleCommandSequence(const floordata::FloorDataValue* floorData, bool fromHeavy);
   void serialize(const serialization::Serializer<World>& ser) const;
   void deserialize(const serialization::Deserializer<World>& ser);
-  void gameLoop(bool godMode, float blackAlpha, ui::Ui& ui);
-  bool cinematicLoop();
+  void updateGameLogic(bool godMode);
+  bool tickCinematic();
+  void renderCinematic() const;
   void load(const std::optional<size_t>& slot);
   void save(const std::optional<size_t>& slot);
   void save(const std::filesystem::path& filename);
@@ -270,13 +271,12 @@ class World final
 
   void addPickupWidget(Sprite sprite, size_t count)
   {
-    static auto constexpr widgetLifetime = 75_frame;
+    static auto constexpr widgetLifetime = 75_tick;
     auto isSameVirginItem = [&sprite](const ui::PickupWidget& item) -> bool
     {
       return item.getSprite() == sprite && item.getDuration() == widgetLifetime;
     };
-    if(auto it = std::find_if(m_pickupWidgets.begin(), m_pickupWidgets.end(), isSameVirginItem);
-       it != m_pickupWidgets.end())
+    if(const auto it = std::ranges::find_if(m_pickupWidgets, isSameVirginItem); it != m_pickupWidgets.end())
     {
       it->setCount(count); // at this point the picked up ammo is already in the player's inventory
       return;
@@ -345,10 +345,10 @@ class World final
 
   void hitLara(const core::Health& damage);
 
-private:
-  void drawPickupWidgets(ui::Ui& ui);
+  void constructPickupWidgets(ui::Ui& ui);
 
-  gsl::not_null<Engine*> m_engine;
+private:
+  gsl_lite::not_null<Engine*> m_engine;
   std::filesystem::path m_levelFilename;
 
   std::unique_ptr<AudioEngine> m_audioEngine;
@@ -365,11 +365,11 @@ class World final
 
   bool m_levelFinished = false;
 
-  struct PositionalEmitter final : public audio::Emitter
+  struct PositionalEmitter final : audio::Emitter
   {
     glm::vec3 position;
 
-    PositionalEmitter(const glm::vec3& position, const gsl::not_null<audio::SoundEngine*>& engine)
+    PositionalEmitter(const glm::vec3& position, const gsl_lite::not_null<audio::SoundEngine*>& engine)
         : Emitter{engine}
         , position{position}
     {
@@ -396,7 +396,7 @@ class World final
   std::shared_ptr<Player> m_player;
   std::shared_ptr<Player> m_levelStartPlayer;
 
-  engine::floordata::FloorData m_floorData;
+  floordata::FloorData m_floorData;
   std::vector<uint8_t> m_samplesData;
   gslu::nn_shared<WorldGeometry> m_worldGeometry;
 
@@ -424,4 +424,4 @@ class World final
   void initCameraController();
   void initStaticSoundEffects(const loader::file::level::Level& level);
 };
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/worldgeometry.cpp b/src/engine/world/worldgeometry.cpp
index c952a56cc..8baac887d 100644
--- a/src/engine/world/worldgeometry.cpp
+++ b/src/engine/world/worldgeometry.cpp
@@ -50,7 +50,7 @@
 #include <gl/renderstate.h>
 #include <gl/texture2darray.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <ios>
 #include <iterator>
@@ -66,8 +66,7 @@ namespace engine::world
 {
 const std::unique_ptr<SpriteSequence>& WorldGeometry::findSpriteSequenceForType(const core::TypeId& type) const
 {
-  const auto it = m_spriteSequences.find(type);
-  if(it != m_spriteSequences.end())
+  if(const auto it = m_spriteSequences.find(type); it != m_spriteSequences.end())
     return it->second;
 
   static const std::unique_ptr<SpriteSequence> none;
@@ -76,7 +75,7 @@ const std::unique_ptr<SpriteSequence>& WorldGeometry::findSpriteSequenceForType(
 
 const StaticMesh* WorldGeometry::findStaticMeshById(const core::StaticMeshId& meshId) const
 {
-  auto it = m_staticMeshes.find(meshId);
+  const auto it = m_staticMeshes.find(meshId);
   if(it != m_staticMeshes.end())
     return &it->second;
 
@@ -85,8 +84,7 @@ const StaticMesh* WorldGeometry::findStaticMeshById(const core::StaticMeshId& me
 
 const std::unique_ptr<SkeletalModelType>& WorldGeometry::findAnimatedModelForType(const core::TypeId& type) const
 {
-  const auto it = m_animatedModels.find(type);
-  if(it != m_animatedModels.end())
+  if(const auto it = m_animatedModels.find(type); it != m_animatedModels.end())
     return it->second;
 
   static const std::unique_ptr<SkeletalModelType> none;
@@ -100,12 +98,11 @@ gslu::nn_shared<RenderMeshData> WorldGeometry::getRenderMesh(const size_t idx) c
 
 core::TypeId WorldGeometry::find(const SkeletalModelType* model) const
 {
-  auto it = std::find_if(m_animatedModels.begin(),
-                         m_animatedModels.end(),
-                         [&model](const auto& item) noexcept
-                         {
-                           return item.second.get() == model;
-                         });
+  const auto it = std::ranges::find_if(m_animatedModels,
+                                       [&model](const auto& item) noexcept
+                                       {
+                                         return item.second.get() == model;
+                                       });
   if(it != m_animatedModels.end())
     return it->first;
 
@@ -114,12 +111,12 @@ core::TypeId WorldGeometry::find(const SkeletalModelType* model) const
 
 core::TypeId WorldGeometry::find(const Sprite* sprite) const
 {
-  auto it = std::find_if(m_spriteSequences.begin(),
-                         m_spriteSequences.end(),
-                         [&sprite](const auto& sequence)
-                         {
-                           return !sequence.second->sprites.empty() && &sequence.second->sprites[0] == sprite;
-                         });
+  const auto it
+    = std::ranges::find_if(m_spriteSequences,
+                           [&sprite](const auto& sequence)
+                           {
+                             return !sequence.second->sprites.empty() && &sequence.second->sprites[0] == sprite;
+                           });
   if(it != m_spriteSequences.end())
     return it->first;
 
@@ -128,62 +125,59 @@ core::TypeId WorldGeometry::find(const Sprite* sprite) const
 
 void WorldGeometry::initMeshes(const loader::file::level::Level& level)
 {
-  std::transform(level.m_meshes.begin(),
-                 level.m_meshes.end(),
-                 std::back_inserter(m_meshes),
-                 [this](const loader::file::Mesh& mesh)
-                 {
-                   return Mesh{mesh.collision_center,
-                               mesh.collision_radius,
-                               gsl::make_shared<RenderMeshData>(mesh, m_atlasTiles, m_palette)};
-                 });
+  std::ranges::transform(level.m_meshes,
+                         std::back_inserter(m_meshes),
+                         [this](const loader::file::Mesh& mesh)
+                         {
+                           return Mesh{mesh.collision_center,
+                                       mesh.collision_radius,
+                                       gsl_lite::make_shared<RenderMeshData>(mesh, m_atlasTiles, m_palette)};
+                         });
 }
 
 void WorldGeometry::initTextureDependentDataFromLevel(const loader::file::level::Level& level)
 {
-  std::transform(level.m_textureTiles.begin(),
-                 level.m_textureTiles.end(),
-                 std::back_inserter(m_atlasTiles),
-                 [](const loader::file::TextureTile& tile)
-                 {
-                   return AtlasTile{tile.textureKey,
-                                    {tile.uvCoordinates[0].toGl(),
-                                     tile.uvCoordinates[1].toGl(),
-                                     tile.uvCoordinates[2].toGl(),
-                                     tile.uvCoordinates[3].toGl()}};
-                 });
-
-  std::transform(level.m_sprites.begin(),
-                 level.m_sprites.end(),
-                 std::back_inserter(m_sprites),
-                 [](const loader::file::Sprite& sprite)
-                 {
-                   return Sprite{sprite.atlas_id,
-                                 sprite.uv0.toGl(),
-                                 sprite.uv1.toGl(),
-                                 sprite.render0,
-                                 sprite.render1,
-                                 nullptr,
-                                 nullptr,
-                                 {nullptr, nullptr}};
-                 });
+  std::ranges::transform(level.m_textureTiles,
+                         std::back_inserter(m_atlasTiles),
+                         [](const loader::file::TextureTile& tile)
+                         {
+                           return AtlasTile{tile.textureKey,
+                                            {tile.uvCoordinates[0].toGl(),
+                                             tile.uvCoordinates[1].toGl(),
+                                             tile.uvCoordinates[2].toGl(),
+                                             tile.uvCoordinates[3].toGl()}};
+                         });
+
+  std::ranges::transform(level.m_sprites,
+                         std::back_inserter(m_sprites),
+                         [](const loader::file::Sprite& sprite)
+                         {
+                           return Sprite{sprite.atlas_id,
+                                         sprite.uv0.toGl(),
+                                         sprite.uv1.toGl(),
+                                         sprite.render0,
+                                         sprite.render1,
+                                         nullptr,
+                                         nullptr,
+                                         {nullptr, nullptr}};
+                         });
 
   for(const auto& [sequenceId, sequence] : level.m_spriteSequences)
   {
     gsl_Assert(sequence != nullptr);
     gsl_Assert(sequence->length <= 0);
-    gsl_Assert(gsl::narrow<size_t>(sequence->offset - sequence->length) <= m_sprites.size());
+    gsl_Assert(gsl_lite::narrow<size_t>(sequence->offset - sequence->length) <= m_sprites.size());
 
     auto seq = std::make_unique<SpriteSequence>();
-    *seq = SpriteSequence{sequence->type, gsl::make_span(&m_sprites.at(sequence->offset), -sequence->length)};
+    *seq = SpriteSequence{sequence->type, gsl_lite::make_span(&m_sprites.at(sequence->offset), -sequence->length)};
     const bool distinct = m_spriteSequences.emplace(sequenceId, std::move(seq)).second;
     gsl_Assert(distinct);
   }
 }
 
 void WorldGeometry::initStaticMeshes(const loader::file::level::Level& level,
-                                     const std::vector<gsl::not_null<const Mesh*>>& meshesDirect,
-                                     const Engine& engine)
+                                     const std::vector<gsl_lite::not_null<const Mesh*>>& meshesDirect,
+                                     Engine& engine)
 {
   for(const auto& staticMesh : level.m_staticMeshes)
   {
@@ -191,14 +185,14 @@ void WorldGeometry::initStaticMeshes(const loader::file::level::Level& level,
     if(staticMesh.isVisible())
       compositor.append(*meshesDirect.at(staticMesh.mesh)->meshData, gl::SRGBA8{0, 0, 0, 0});
     auto mesh = compositor.toMesh(
-      *engine.getPresenter().getMaterialManager(),
+      engine.getPresenter().getRenderSystem().getMaterialManager(),
       false,
       false,
-      []()
+      []
       {
         return false;
       },
-      [&engine]()
+      [&engine]
       {
         const auto& settings = engine.getEngineConfig()->renderSettings;
         return !settings.lightingModeActive ? 0 : settings.lightingMode;
@@ -213,16 +207,15 @@ void WorldGeometry::initStaticMeshes(const loader::file::level::Level& level,
   }
 }
 
-std::vector<gsl::not_null<const Mesh*>> WorldGeometry::initAnimatedModels(const loader::file::level::Level& level)
+std::vector<gsl_lite::not_null<const Mesh*>> WorldGeometry::initAnimatedModels(const loader::file::level::Level& level)
 {
-  std::vector<gsl::not_null<const Mesh*>> meshesDirect;
-  std::transform(level.m_meshIndices.begin(),
-                 level.m_meshIndices.end(),
-                 std::back_inserter(meshesDirect),
-                 [this](auto& idx)
-                 {
-                   return gsl::not_null{&m_meshes.at(idx)};
-                 });
+  std::vector<gsl_lite::not_null<const Mesh*>> meshesDirect;
+  std::ranges::transform(level.m_meshIndices,
+                         std::back_inserter(meshesDirect),
+                         [this](auto& idx)
+                         {
+                           return gsl_lite::not_null{&m_meshes.at(idx)};
+                         });
 
   for(const auto& [modelId, model] : level.m_animatedModels)
   {
@@ -237,13 +230,13 @@ std::vector<gsl::not_null<const Mesh*>> WorldGeometry::initAnimatedModels(const
     const auto frames = reinterpret_cast<const loader::file::AnimFrame*>(&model->pose_data_offset.from(m_poseFrames));
     if(model->nMeshes > 1)
     {
-      model->boneTree = gsl::make_span(
+      model->boneTree = gsl_lite::make_span(
         // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
         reinterpret_cast<const loader::file::BoneTreeEntry*>(&model->bone_index.from(m_boneTrees)),
         model->nMeshes - 1);
     }
 
-    Animation* animations = nullptr;
+    const Animation* animations = nullptr;
     if(model->animation_index.index != 0xffff)
       animations = &model->animation_index.from(m_animations);
 
@@ -251,7 +244,7 @@ std::vector<gsl::not_null<const Mesh*>> WorldGeometry::initAnimatedModels(const
     if(model->nMeshes > 0)
     {
       BOOST_ASSERT(model->boneTree.empty() || static_cast<size_t>(model->nMeshes) == model->boneTree.size() + 1);
-      for(size_t i = 0; i < gsl::narrow_cast<size_t>(model->nMeshes); ++i)
+      for(size_t i = 0; i < gsl_lite::narrow_cast<size_t>(model->nMeshes); ++i)
       {
         const auto mesh = (model->mesh_base_index + i).from(meshesDirect);
         bones.emplace_back(mesh->meshData,
@@ -304,7 +297,7 @@ void WorldGeometry::initAnimationData(const loader::file::level::Level& level)
     }
 
     gsl_Assert(anim.nextAnimationIndex < m_animations.size());
-    auto nextAnimation = &m_animations[anim.nextAnimationIndex];
+    const auto nextAnimation = &m_animations[anim.nextAnimationIndex];
 
     const auto validAnimCommands
       = anim.animCommandCount == 0 || (anim.animCommandIndex + anim.animCommandCount).exclusiveIn(m_animCommands);
@@ -316,9 +309,9 @@ void WorldGeometry::initAnimationData(const loader::file::level::Level& level)
 
     gsl_Assert(anim.transitionsCount == 0
                || (anim.transitionsIndex + anim.transitionsCount).exclusiveIn(m_transitions));
-    gsl::span<const Transitions> transitions;
+    gsl_lite::span<const Transitions> transitions;
     if(anim.transitionsCount > 0)
-      transitions = gsl::span{&anim.transitionsIndex.from(m_transitions), anim.transitionsCount};
+      transitions = gsl_lite::span{&anim.transitionsIndex.from(m_transitions), anim.transitionsCount};
 
     gsl_Assert(anim.segmentLength > 0_frame);
     gsl_Assert(anim.firstFrame <= anim.lastFrame);
@@ -354,9 +347,8 @@ void WorldGeometry::initAnimationData(const loader::file::level::Level& level)
   gsl_Ensures(m_transitionCases.size() == level.m_transitionCases.size());
 
   gsl_Assert(m_transitions.size() == level.m_transitions.size());
-  std::transform(
-    level.m_transitions.begin(),
-    level.m_transitions.end(),
+  std::ranges::transform(
+    level.m_transitions,
     m_transitions.begin(),
     [this](const loader::file::Transitions& transitions)
     {
@@ -364,7 +356,7 @@ void WorldGeometry::initAnimationData(const loader::file::level::Level& level)
       if(transitions.transitionCaseCount > 0)
         return Transitions{
           transitions.stateId,
-          gsl::span{&transitions.firstTransitionCase.from(m_transitionCases), transitions.transitionCaseCount}};
+          gsl_lite::span{&transitions.firstTransitionCase.from(m_transitionCases), transitions.transitionCaseCount}};
       return Transitions{};
     });
   gsl_Ensures(m_transitions.size() == level.m_transitions.size());
@@ -412,14 +404,15 @@ void WorldGeometry::initTextures(Engine& engine, const loader::file::level::Leve
   std::filesystem::create_directories(cacheDir);
 
   render::MultiTextureAtlas atlases{3072, validTextureCache};
-  m_controllerLayouts = loadControllerButtonIcons(
-    atlases,
-    util::ensureFileExists(engine.getEngineDataPath() / "button-icons" / "buttons.yaml"),
-    engine.getPresenter().getMaterialManager()->getSprite(render::material::SpriteMaterialMode::Billboard,
-                                                          []()
-                                                          {
-                                                            return 0;
-                                                          }));
+  m_controllerLayouts
+    = loadControllerButtonIcons(atlases,
+                                util::ensureFileExists(engine.getEngineDataPath() / "button-icons" / "buttons.yaml"),
+                                engine.getPresenter().getRenderSystem().getMaterialManager().getSprite(
+                                  render::material::SpriteMaterialMode::Billboard,
+                                  []
+                                  {
+                                    return 0;
+                                  }));
 
   {
     auto lastDrawUpdate = std::chrono::high_resolution_clock::now();
@@ -431,8 +424,7 @@ void WorldGeometry::initTextures(Engine& engine, const loader::file::level::Leve
       m_sprites,
       [&lastDrawUpdate, &engine](const std::string& s)
       {
-        const auto now = std::chrono::high_resolution_clock::now();
-        if(lastDrawUpdate + core::TimePerFrame < now)
+        if(const auto now = std::chrono::high_resolution_clock::now(); lastDrawUpdate + core::TimePerFrame < now)
         {
           lastDrawUpdate = now;
           engine.getPresenter().drawLoadingScreen(s);
@@ -440,13 +432,13 @@ void WorldGeometry::initTextures(Engine& engine, const loader::file::level::Leve
       },
       cacheDir);
   }
-  engine.getPresenter().getMaterialManager()->setGeometryTextures(gsl::not_null{m_allTextures});
+  engine.getPresenter().getRenderSystem().getMaterialManager().setGeometryTextures(gsl_lite::not_null{m_allTextures});
 
   // NOLINTNEXTLINE(bugprone-unused-raii)
   std::ofstream{getTextureCacheVersionFilePath(cacheDir), std::ios::trunc};
 }
 
-void WorldGeometry::initSpriteMeshes(const Engine& engine)
+void WorldGeometry::initSpriteMeshes(Engine& engine)
 {
   for(size_t i = 0; i < m_sprites.size(); ++i)
   {
@@ -459,13 +451,12 @@ void WorldGeometry::initSpriteMeshes(const Engine& engine)
       sprite.uv0,
       sprite.uv1,
       render::material::RenderMode::FullNonOpaque,
-      engine.getPresenter().getMaterialManager()->getSprite(render::material::SpriteMaterialMode::YAxisBound,
-                                                            [config = engine.getEngineConfig()]()
-                                                            {
-                                                              return !config->renderSettings.lightingModeActive
-                                                                       ? 0
-                                                                       : config->renderSettings.lightingMode;
-                                                            }),
+      engine.getPresenter().getRenderSystem().getMaterialManager().getSprite(
+        render::material::SpriteMaterialMode::YAxisBound,
+        [config = engine.getEngineConfig()]
+        {
+          return !config->renderSettings.lightingModeActive ? 0 : config->renderSettings.lightingMode;
+        }),
       sprite.atlasId.get_as<int32_t>(),
       "sprite-" + std::to_string(i) + "-ybound");
     sprite.billboardMesh = render::scene::createSpriteMesh(
@@ -476,13 +467,12 @@ void WorldGeometry::initSpriteMeshes(const Engine& engine)
       sprite.uv0,
       sprite.uv1,
       render::material::RenderMode::FullNonOpaque,
-      engine.getPresenter().getMaterialManager()->getSprite(render::material::SpriteMaterialMode::Billboard,
-                                                            [config = engine.getEngineConfig()]()
-                                                            {
-                                                              return !config->renderSettings.lightingModeActive
-                                                                       ? 0
-                                                                       : config->renderSettings.lightingMode;
-                                                            }),
+      engine.getPresenter().getRenderSystem().getMaterialManager().getSprite(
+        render::material::SpriteMaterialMode::Billboard,
+        [config = engine.getEngineConfig()]
+        {
+          return !config->renderSettings.lightingModeActive ? 0 : config->renderSettings.lightingMode;
+        }),
       sprite.atlasId.get_as<int32_t>(),
       "sprite-" + std::to_string(i) + "-billboard");
     sprite.instancedBillboardMesh = render::scene::createInstancedSpriteMesh(
@@ -493,13 +483,12 @@ void WorldGeometry::initSpriteMeshes(const Engine& engine)
       sprite.uv0,
       sprite.uv1,
       render::material::RenderMode::FullNonOpaque,
-      engine.getPresenter().getMaterialManager()->getSprite(render::material::SpriteMaterialMode::InstancedBillboard,
-                                                            [config = engine.getEngineConfig()]()
-                                                            {
-                                                              return !config->renderSettings.lightingModeActive
-                                                                       ? 0
-                                                                       : config->renderSettings.lightingMode;
-                                                            }),
+      engine.getPresenter().getRenderSystem().getMaterialManager().getSprite(
+        render::material::SpriteMaterialMode::InstancedBillboard,
+        [config = engine.getEngineConfig()]
+        {
+          return !config->renderSettings.lightingModeActive ? 0 : config->renderSettings.lightingMode;
+        }),
       sprite.atlasId.get_as<int32_t>(),
       "sprite-" + std::to_string(i) + "-instanced");
   }
@@ -514,13 +503,12 @@ WorldGeometry::WorldGeometry(Engine& engine, const loader::file::level::Level& l
   initTextures(engine, level);
   initSpriteMeshes(engine);
 
-  std::transform(level.m_palette->colors.begin(),
-                 level.m_palette->colors.end(),
-                 m_palette.begin(),
-                 [](const loader::file::ByteColor& color) noexcept
-                 {
-                   return color.toTextureColor();
-                 });
+  std::ranges::transform(level.m_palette->colors,
+                         m_palette.begin(),
+                         [](const loader::file::ByteColor& color) noexcept
+                         {
+                           return color.toTextureColor();
+                         });
 
   initAnimationData(level);
   initMeshes(level);
@@ -529,4 +517,4 @@ WorldGeometry::WorldGeometry(Engine& engine, const loader::file::level::Level& l
 }
 
 WorldGeometry::~WorldGeometry() = default;
-} // namespace engine::world
+} // namespace engine::world
\ No newline at end of file
diff --git a/src/engine/world/worldgeometry.h b/src/engine/world/worldgeometry.h
index 7510baf02..3069c6190 100644
--- a/src/engine/world/worldgeometry.h
+++ b/src/engine/world/worldgeometry.h
@@ -16,7 +16,7 @@
 #include <cstdint>
 #include <gl/pixel.h>
 #include <gl/soglb_fwd.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 #include <memory>
@@ -32,7 +32,7 @@ enum class AnimationId : uint16_t;
 namespace loader::file::level
 {
 class Level;
-};
+}
 
 namespace engine
 {
@@ -61,7 +61,7 @@ class RoomGeometry final
     return m_geometry;
   }
 
-  [[nodiscard]] std::shared_ptr<render::scene::Mesh> tryGetDustMesh(uint8_t i) const
+  [[nodiscard]] std::shared_ptr<render::scene::Mesh> tryGetDustMesh(const uint8_t i) const
   {
     if(const auto it = m_dustCache.find(i); it != m_dustCache.end())
       return it->second;
@@ -69,7 +69,7 @@ class RoomGeometry final
     return nullptr;
   }
 
-  void setDustCache(uint8_t i, const gslu::nn_shared<render::scene::Mesh>& mesh)
+  void setDustCache(const uint8_t i, const gslu::nn_shared<render::scene::Mesh>& mesh)
   {
     gsl_Assert(m_dustCache.try_emplace(i, mesh).second);
   }
@@ -162,13 +162,13 @@ class WorldGeometry final
 private:
   void initAnimationData(const loader::file::level::Level& level);
   void initMeshes(const loader::file::level::Level& level);
-  std::vector<gsl::not_null<const Mesh*>> initAnimatedModels(const loader::file::level::Level& level);
+  std::vector<gsl_lite::not_null<const Mesh*>> initAnimatedModels(const loader::file::level::Level& level);
   void initStaticMeshes(const loader::file::level::Level& level,
-                        const std::vector<gsl::not_null<const Mesh*>>& meshesDirect,
-                        const Engine& engine);
+                        const std::vector<gsl_lite::not_null<const Mesh*>>& meshesDirect,
+                        Engine& engine);
   void initTextureDependentDataFromLevel(const loader::file::level::Level& level);
   void initTextures(Engine& engine, const loader::file::level::Level& level);
-  void initSpriteMeshes(const Engine& engine);
+  void initSpriteMeshes(Engine& engine);
 
   std::array<gl::SRGBA8, 256> m_palette;
 
diff --git a/src/etcpak/bitmap.cpp b/src/etcpak/bitmap.cpp
index 61b4f1943..79fd79c1a 100644
--- a/src/etcpak/bitmap.cpp
+++ b/src/etcpak/bitmap.cpp
@@ -4,30 +4,30 @@
 #include <cstddef>
 #include <cstdint>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <mutex>
 #include <tuple>
 #include <utility>
 
 Bitmap::Bitmap(const glm::ivec2& size)
-    : m_linesLeft{gsl::narrow_cast<uint32_t>(size.y / 4)}
+    : m_linesLeft{gsl_lite::narrow_cast<uint32_t>(size.y / 4)}
     , m_size{size}
 {
   gsl_Assert(size.x > 0 && size.y > 0);
-  m_data.resize(gsl::narrow_cast<size_t>(size.x) * gsl::narrow_cast<size_t>(size.y));
+  m_data.resize(gsl_lite::narrow_cast<size_t>(size.x) * gsl_lite::narrow_cast<size_t>(size.y));
   // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
   m_block = m_data.data();
 }
 
-Bitmap::Bitmap(const glm::ivec2& size, const gsl::span<const uint32_t>& rgba)
-    : m_linesLeft{gsl::narrow_cast<uint32_t>(size.y / 4)}
+Bitmap::Bitmap(const glm::ivec2& size, const gsl_lite::span<const uint32_t>& rgba)
+    : m_linesLeft{gsl_lite::narrow_cast<uint32_t>(size.y / 4)}
     , m_size{size}
 {
   gsl_Assert(size.x > 0 && size.y > 0);
-  gsl_Assert(gsl::narrow_cast<size_t>(size.x) * gsl::narrow_cast<size_t>(size.y) == rgba.size());
+  gsl_Assert(gsl_lite::narrow_cast<size_t>(size.x) * gsl_lite::narrow_cast<size_t>(size.y) == rgba.size());
 
-  m_data.resize(gsl::narrow_cast<size_t>(size.x) * gsl::narrow_cast<size_t>(size.y));
-  std::copy(rgba.begin(), rgba.end(), m_data.begin());
+  m_data.resize(gsl_lite::narrow_cast<size_t>(size.x) * gsl_lite::narrow_cast<size_t>(size.y));
+  std::ranges::copy(rgba, m_data.begin());
   // convert to the expected BGRA input from RGBA
   for(auto& px : m_data)
   {
@@ -39,17 +39,17 @@ Bitmap::Bitmap(const glm::ivec2& size, const gsl::span<const uint32_t>& rgba)
   m_block = m_data.data();
 }
 
-Bitmap::Bitmap(uint32_t lines)
+Bitmap::Bitmap(const uint32_t lines)
     : m_linesLeft{lines}
 {
 }
 
-std::tuple<const uint32_t*, uint32_t, bool> Bitmap::nextBlock(uint32_t wantedLines)
+std::tuple<const uint32_t*, uint32_t, bool> Bitmap::nextBlock(const uint32_t wantedLines)
 {
-  const std::lock_guard<std::mutex> lock(m_lock);
+  const std::lock_guard lock(m_lock);
   const auto lines = std::min(wantedLines, m_linesLeft);
   auto ret = m_block;
-  m_block += m_size.x * size_t(4u) * lines;
+  m_block += m_size.x * static_cast<size_t>(4u) * lines;
   m_linesLeft -= lines;
   return {ret, lines, m_linesLeft == 0};
-}
+}
\ No newline at end of file
diff --git a/src/etcpak/bitmap.hpp b/src/etcpak/bitmap.hpp
index 58d1e18a9..54a0fea9b 100644
--- a/src/etcpak/bitmap.hpp
+++ b/src/etcpak/bitmap.hpp
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <mutex>
 #include <tuple>
 #include <vector>
@@ -11,17 +11,19 @@ class Bitmap
 {
 public:
   explicit Bitmap(const glm::ivec2& size);
-  explicit Bitmap(const glm::ivec2& size, const gsl::span<const uint32_t>& rgba);
+  explicit Bitmap(const glm::ivec2& size, const gsl_lite::span<const uint32_t>& rgba);
   virtual ~Bitmap() = default;
 
   [[nodiscard]] uint32_t* data() noexcept
   {
     return m_data.data();
   }
+
   [[nodiscard]] const uint32_t* data() const noexcept
   {
     return m_data.data();
   }
+
   [[nodiscard]] const glm::ivec2& size() const noexcept
   {
     return m_size;
@@ -37,4 +39,4 @@ class Bitmap
   uint32_t m_linesLeft;
   glm::ivec2 m_size{};
   std::mutex m_lock;
-};
+};
\ No newline at end of file
diff --git a/src/etcpak/blockdata.cpp b/src/etcpak/blockdata.cpp
index 448ca80be..37a803616 100644
--- a/src/etcpak/blockdata.cpp
+++ b/src/etcpak/blockdata.cpp
@@ -12,7 +12,7 @@
 #include <cstring>
 #include <fstream>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 #include <memory>
 
@@ -33,14 +33,14 @@
 
 namespace
 {
-constexpr const std::array<uint8_t, 8> table59T58H{{3, 6, 11, 16, 23, 32, 41, 64}};
+constexpr std::array<uint8_t, 8> table59T58H{{3, 6, 11, 16, 23, 32, 41, 64}};
 
-boost::iostreams::mapped_file_sink openForWriting(const char* fn, size_t len, const glm::ivec2& size)
+boost::iostreams::mapped_file_sink openForWriting(const char* fn, const size_t len, const glm::ivec2& size)
 {
   {
     std::ofstream tmp{fn, std::ios::binary | std::ios::trunc};
     tmp.seekp(len - 1, std::ios::beg);
-    const char zero = 0;
+    constexpr char zero = 0;
     tmp.write(&zero, 1);
   }
 
@@ -76,13 +76,13 @@ BlockData::BlockData(const char* fn)
   m_data = reinterpret_cast<uint8_t*>(m_file->data());
 
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-  auto data32 = reinterpret_cast<uint32_t*>(m_data);
+  const auto data32 = reinterpret_cast<uint32_t*>(m_data);
   gsl_Assert(*data32 == 0x03525650);
   // pixelformat[0]
   gsl_Assert(*(data32 + 2) == 23);
 
-  m_size.y = gsl::narrow_cast<int32_t>(*(data32 + 6));
-  m_size.x = gsl::narrow_cast<int32_t>(*(data32 + 7));
+  m_size.y = gsl_lite::narrow_cast<int32_t>(*(data32 + 6));
+  m_size.x = gsl_lite::narrow_cast<int32_t>(*(data32 + 7));
   gsl_Assert(m_size.x > 0 && m_size.y > 0);
   m_dataOffset = 52u + *(data32 + 12);
 }
@@ -90,7 +90,7 @@ BlockData::BlockData(const char* fn)
 BlockData::BlockData(const char* fn, const glm::ivec2& size)
     : m_size(size)
     , m_dataOffset(52)
-    , m_maplen(gsl::narrow_cast<size_t>((m_size.x / 4) * (m_size.y / 4)) * sizeof(uint64_t) * 2u)
+    , m_maplen(gsl_lite::narrow_cast<size_t>((m_size.x / 4) * (m_size.y / 4)) * sizeof(uint64_t) * 2u)
 {
   gsl_Expects(m_size.x % 4 == 0 && m_size.y % 4 == 0);
 
@@ -103,7 +103,7 @@ BlockData::BlockData(const char* fn, const glm::ivec2& size)
 BlockData::BlockData(const glm::ivec2& size)
     : m_size(size)
     , m_dataOffset(52)
-    , m_maplen{gsl::narrow_cast<size_t>((m_size.x / 4) * (m_size.y / 4)) * sizeof(uint64_t) * 2u}
+    , m_maplen{gsl_lite::narrow_cast<size_t>((m_size.x / 4) * (m_size.y / 4)) * sizeof(uint64_t) * 2u}
 {
   gsl_Assert(m_size.x > 0 && m_size.y > 0);
   gsl_Assert(m_size.x % 4 == 0 && m_size.y % 4 == 0);
@@ -119,30 +119,31 @@ BlockData::~BlockData()
 }
 
 // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-void BlockData::processRgba(const uint32_t* src, uint32_t blocks, size_t offset, size_t width, bool useHeuristics)
+void BlockData::processRgba(
+  const uint32_t* src, const uint32_t blocks, const size_t offset, const size_t width, const bool useHeuristics)
 {
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-  auto dst = reinterpret_cast<uint64_t*>(m_data + m_dataOffset) + offset * 2u;
+  const auto dst = reinterpret_cast<uint64_t*>(m_data + m_dataOffset) + offset * 2u;
 
   compressEtc2Bgra(src, dst, blocks, width, useHeuristics);
 }
 
 namespace
 {
-constexpr uint8_t expand6(uint8_t value)
+constexpr uint8_t expand6(const uint8_t value)
 {
   // NOLINTNEXTLINE(hicpp-signed-bitwise)
   return (value << 2u) | (value >> 4u);
 }
 
-constexpr uint8_t expand7(uint8_t value)
+constexpr uint8_t expand7(const uint8_t value)
 {
   // NOLINTNEXTLINE(hicpp-signed-bitwise)
   return (value << 1u) | (value >> 6u);
 }
 
 // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-void decodeTAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w)
+void decodeTAlpha(const uint64_t block, const uint64_t alpha, uint32_t* dst, const uint32_t w)
 {
   const auto r0 = (block >> 24u) & 0x1Bu;
   const auto rh0 = (r0 >> 3u) & 0x3u;
@@ -154,20 +155,20 @@ void decodeTAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w)
   const auto g1 = (block >> 8u) & 0xFu;
   const auto b1 = (block >> 4u) & 0xFu;
 
-  const auto cr0 = gsl::narrow_cast<uint8_t>(((rh0 << 6u) | (rl0 << 4u) | (rh0 << 2u) | rl0));
-  const auto cg0 = gsl::narrow_cast<uint8_t>((g0 << 4u) | g0);
-  const auto cb0 = gsl::narrow_cast<uint8_t>((b0 << 4u) | b0);
+  const auto cr0 = gsl_lite::narrow_cast<uint8_t>(((rh0 << 6u) | (rl0 << 4u) | (rh0 << 2u) | rl0));
+  const auto cg0 = gsl_lite::narrow_cast<uint8_t>((g0 << 4u) | g0);
+  const auto cb0 = gsl_lite::narrow_cast<uint8_t>((b0 << 4u) | b0);
 
-  const auto cr1 = gsl::narrow_cast<uint16_t>((r1 << 4u) | r1);
-  const auto cg1 = gsl::narrow_cast<uint16_t>((g1 << 4u) | g1);
-  const auto cb1 = gsl::narrow_cast<uint16_t>((b1 << 4u) | b1);
+  const auto cr1 = gsl_lite::narrow_cast<uint16_t>((r1 << 4u) | r1);
+  const auto cg1 = gsl_lite::narrow_cast<uint16_t>((g1 << 4u) | g1);
+  const auto cb1 = gsl_lite::narrow_cast<uint16_t>((b1 << 4u) | b1);
 
   const auto codeword_hi = (block >> 2u) & 0x3u;
   const auto codeword_lo = block & 0x1u;
   const auto codeword = (codeword_hi << 1u) | codeword_lo;
 
-  const auto base = gsl::narrow_cast<int32_t>(alpha >> 56u);
-  const auto mul = gsl::narrow_cast<int32_t>((alpha >> 52u) & 0xFu);
+  const auto base = gsl_lite::narrow_cast<int32_t>(alpha >> 56u);
+  const auto mul = gsl_lite::narrow_cast<int32_t>((alpha >> 52u) & 0xFu);
 
   const auto c2r = clampu8(cr1 + table59T58H[codeword]);
   const auto c2g = clampu8(cg1 + table59T58H[codeword]);
@@ -179,13 +180,13 @@ void decodeTAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w)
 
   const std::array<uint32_t, 4> col_tab{{
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    gsl::narrow_cast<uint32_t>(cr0 | (cg0 << 8u) | (cb0 << 16u)),
+    gsl_lite::narrow_cast<uint32_t>(cr0 | (cg0 << 8u) | (cb0 << 16u)),
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    gsl::narrow_cast<uint32_t>(c2r | (c2g << 8u) | (c2b << 16u)),
+    gsl_lite::narrow_cast<uint32_t>(c2r | (c2g << 8u) | (c2b << 16u)),
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    gsl::narrow_cast<uint32_t>(cr1 | (cg1 << 8u) | (cb1 << 16u)),
+    gsl_lite::narrow_cast<uint32_t>(cr1 | (cg1 << 8u) | (cb1 << 16u)),
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    gsl::narrow_cast<uint32_t>(c3r | (c3g << 8u) | (c3b << 16u)),
+    gsl_lite::narrow_cast<uint32_t>(c3r | (c3g << 8u) | (c3b << 16u)),
   }};
 
   const auto& tbl = getAlpha()[(alpha >> 48u) & 0xFu];
@@ -204,7 +205,7 @@ void decodeTAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w)
 }
 
 // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-void decodeHAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w)
+void decodeHAlpha(const uint64_t block, const uint64_t alpha, uint32_t* dst, const uint32_t w)
 {
   const uint32_t indexes = (block >> 32u) & 0xFFFFFFFFu;
 
@@ -216,13 +217,13 @@ void decodeHAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w)
   const auto g1444 = (block >> 7u) & 0xFu;
   const auto b1444 = (block >> 3u) & 0xFu;
 
-  const auto r0 = gsl::narrow_cast<uint8_t>((r0444 << 4u) | r0444);
-  const auto g0 = gsl::narrow_cast<uint8_t>((g0444 << 4u) | g0444);
-  const auto b0 = gsl::narrow_cast<uint8_t>((b0444 << 4u) | b0444);
+  const auto r0 = gsl_lite::narrow_cast<uint8_t>((r0444 << 4u) | r0444);
+  const auto g0 = gsl_lite::narrow_cast<uint8_t>((g0444 << 4u) | g0444);
+  const auto b0 = gsl_lite::narrow_cast<uint8_t>((b0444 << 4u) | b0444);
 
-  const auto r1 = gsl::narrow_cast<uint8_t>((r1444 << 4u) | r1444);
-  const auto g1 = gsl::narrow_cast<uint8_t>((g1444 << 4u) | g1444);
-  const auto b1 = gsl::narrow_cast<uint8_t>((b1444 << 4u) | b1444);
+  const auto r1 = gsl_lite::narrow_cast<uint8_t>((r1444 << 4u) | r1444);
+  const auto g1 = gsl_lite::narrow_cast<uint8_t>((g1444 << 4u) | g1444);
+  const auto b1 = gsl_lite::narrow_cast<uint8_t>((b1444 << 4u) | b1444);
 
   const auto codeword_hi = ((block & 0x1u) << 1u) | ((block & 0x4u));
   const auto c0 = (r0444 << 8u) | (g0444 << 4u) | (b0444 << 0u);
@@ -230,23 +231,23 @@ void decodeHAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w)
   const auto codeword_lo = (c0 >= c1) ? 1u : 0u;
   const auto codeword = codeword_hi | codeword_lo;
 
-  const int32_t base = gsl::narrow_cast<uint8_t>(alpha >> 56u);
-  const int32_t mul = gsl::narrow_cast<uint8_t>((alpha >> 52u) & 0xFu);
+  const int32_t base = gsl_lite::narrow_cast<uint8_t>(alpha >> 56u);
+  const int32_t mul = gsl_lite::narrow_cast<uint8_t>((alpha >> 52u) & 0xFu);
   const auto& tbl = getAlpha()[(alpha >> 48u) & 0xFu];
 
   const std::array<uint32_t, 4> col_tab{{
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    gsl::narrow_cast<uint32_t>(clampu8(r0 + table59T58H[codeword]) | (clampu8(g0 + table59T58H[codeword]) << 8u)
-                               | (clampu8(b0 + table59T58H[codeword]) << 16u)),
+    gsl_lite::narrow_cast<uint32_t>(clampu8(r0 + table59T58H[codeword]) | (clampu8(g0 + table59T58H[codeword]) << 8u)
+                                    | (clampu8(b0 + table59T58H[codeword]) << 16u)),
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    gsl::narrow_cast<uint32_t>(clampu8(r0 - table59T58H[codeword]) | (clampu8(g0 - table59T58H[codeword]) << 8u)
-                               | (clampu8(b0 - table59T58H[codeword]) << 16u)),
+    gsl_lite::narrow_cast<uint32_t>(clampu8(r0 - table59T58H[codeword]) | (clampu8(g0 - table59T58H[codeword]) << 8u)
+                                    | (clampu8(b0 - table59T58H[codeword]) << 16u)),
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    gsl::narrow_cast<uint32_t>(clampu8(r1 + table59T58H[codeword]) | (clampu8(g1 + table59T58H[codeword]) << 8u)
-                               | (clampu8(b1 + table59T58H[codeword]) << 16u)),
+    gsl_lite::narrow_cast<uint32_t>(clampu8(r1 + table59T58H[codeword]) | (clampu8(g1 + table59T58H[codeword]) << 8u)
+                                    | (clampu8(b1 + table59T58H[codeword]) << 16u)),
     // NOLINTNEXTLINE(hicpp-signed-bitwise)
-    gsl::narrow_cast<uint32_t>(clampu8(r1 - table59T58H[codeword]) | (clampu8(g1 - table59T58H[codeword]) << 8u)
-                               | (clampu8(b1 - table59T58H[codeword]) << 16u)),
+    gsl_lite::narrow_cast<uint32_t>(clampu8(r1 - table59T58H[codeword]) | (clampu8(g1 - table59T58H[codeword]) << 8u)
+                                    | (clampu8(b1 - table59T58H[codeword]) << 16u)),
   }};
 
   for(uint8_t j = 0; j < 4; j++)
@@ -262,7 +263,7 @@ void decodeHAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w)
 }
 
 // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-void decodePlanarAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w)
+void decodePlanarAlpha(const uint64_t block, const uint64_t alpha, uint32_t* dst, const uint32_t w)
 {
   const auto bv = expand6((block >> (0u + 32u)) & 0x3Fu);
   const auto gv = expand7((block >> (6u + 32u)) & 0x7Fu);
@@ -271,8 +272,9 @@ void decodePlanarAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w
   const auto bh = expand6((block >> (19u + 32u)) & 0x3Fu);
   const auto gh = expand7((block >> (25u + 32u)) & 0x7Fu);
 
-  const auto rh0 = gsl::narrow_cast<uint8_t>((block >> (32u - 32u)) & 0x01u); // cppcheck-suppress duplicateExpression
-  const auto rh1 = gsl::narrow_cast<uint8_t>(((block >> (34u - 32u)) & 0x1Fu) << 1u);
+  const auto rh0 = gsl_lite::narrow_cast<uint8_t>((block >> (32u - 32u)) & 0x01u);
+  // cppcheck-suppress duplicateExpression
+  const auto rh1 = gsl_lite::narrow_cast<uint8_t>(((block >> (34u - 32u)) & 0x1Fu) << 1u);
   const auto rh = expand6(rh0 | rh1);
 
   const uint8_t bo0 = (block >> (39u - 32u)) & 0x07u;
@@ -285,24 +287,24 @@ void decodePlanarAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w
   const auto go = expand7(go0 | go1);
   const auto ro = expand6((block >> (57u - 32u)) & 0x3Fu);
 
-  const auto base = gsl::narrow_cast<int32_t>(alpha >> 56u);
-  const auto mul = gsl::narrow_cast<int32_t>((alpha >> 52u) & 0xFu);
+  const auto base = gsl_lite::narrow_cast<int32_t>(alpha >> 56u);
+  const auto mul = gsl_lite::narrow_cast<int32_t>((alpha >> 52u) & 0xFu);
   const auto& tbl = getAlpha()[(alpha >> 48u) & 0xFu];
 
-  auto chco = IVec16{
-    gsl::narrow_cast<int16_t>(rh - ro),
-    gsl::narrow_cast<int16_t>(gh - go),
-    gsl::narrow_cast<int16_t>(bh - bo),
+  const auto chco = IVec16{
+    gsl_lite::narrow_cast<int16_t>(rh - ro),
+    gsl_lite::narrow_cast<int16_t>(gh - go),
+    gsl_lite::narrow_cast<int16_t>(bh - bo),
     0,
     0,
     0,
     0,
     0,
   };
-  auto cvco = IVec16{
-    gsl::narrow_cast<int16_t>((rv - ro) - 4u * (rh - ro)),
-    gsl::narrow_cast<int16_t>((gv - go) - 4u * (gh - go)),
-    gsl::narrow_cast<int16_t>((bv - bo) - 4u * (bh - bo)),
+  const auto cvco = IVec16{
+    gsl_lite::narrow_cast<int16_t>((rv - ro) - 4u * (rh - ro)),
+    gsl_lite::narrow_cast<int16_t>((gv - go) - 4u * (gh - go)),
+    gsl_lite::narrow_cast<int16_t>((bv - bo) - 4u * (bh - bo)),
     0,
     0,
     0,
@@ -310,9 +312,9 @@ void decodePlanarAlpha(uint64_t block, uint64_t alpha, uint32_t* dst, uint32_t w
     0,
   };
   auto col = IVec16{
-    gsl::narrow_cast<int16_t>(4u * ro + 2u),
-    gsl::narrow_cast<int16_t>(4u * go + 2u),
-    gsl::narrow_cast<int16_t>(4u * bo + 2u),
+    gsl_lite::narrow_cast<int16_t>(4u * ro + 2u),
+    gsl_lite::narrow_cast<int16_t>(4u * go + 2u),
+    gsl_lite::narrow_cast<int16_t>(4u * bo + 2u),
     0,
     0,
     0,
@@ -346,7 +348,7 @@ uint64_t convertByteOrder(uint64_t d)
   return d;
 }
 
-void decodeRgbaPart(uint64_t d, uint64_t alpha, uint32_t* dst, uint32_t w)
+void decodeRgbaPart(uint64_t d, uint64_t alpha, uint32_t* dst, const uint32_t w)
 {
   d = convertByteOrder(d);
   alpha = _bswap64(alpha);
@@ -356,17 +358,17 @@ void decodeRgbaPart(uint64_t d, uint64_t alpha, uint32_t* dst, uint32_t w)
 
   if(d & 0x2u)
   {
-    const auto r0 = gsl::narrow_cast<uint8_t>((d & 0xF8000000u) >> 27u);
-    const auto g0 = gsl::narrow_cast<uint8_t>((d & 0x00F80000u) >> 19u);
-    const auto b0 = gsl::narrow_cast<uint8_t>((d & 0x0000F800u) >> 11u);
+    const auto r0 = gsl_lite::narrow_cast<uint8_t>((d & 0xF8000000u) >> 27u);
+    const auto g0 = gsl_lite::narrow_cast<uint8_t>((d & 0x00F80000u) >> 19u);
+    const auto b0 = gsl_lite::narrow_cast<uint8_t>((d & 0x0000F800u) >> 11u);
 
-    const auto dr = (int32_t(d) << 5u) >> 29u;
-    const auto dg = (int32_t(d) << 13u) >> 29u;
-    const auto db = (int32_t(d) << 21u) >> 29u;
+    const auto dr = (static_cast<int32_t>(d) << 5u) >> 29u;
+    const auto dg = (static_cast<int32_t>(d) << 13u) >> 29u;
+    const auto db = (static_cast<int32_t>(d) << 21u) >> 29u;
 
-    const int32_t r1 = int32_t(r0) + dr;
-    const int32_t g1 = int32_t(g0) + dg;
-    const int32_t b1 = int32_t(b0) + db;
+    const int32_t r1 = static_cast<int32_t>(r0) + dr;
+    const int32_t g1 = static_cast<int32_t>(g0) + dg;
+    const int32_t b1 = static_cast<int32_t>(b0) + db;
 
     // T mode
     if(r1 < 0 || r1 > 31)
@@ -413,8 +415,8 @@ void decodeRgbaPart(uint64_t d, uint64_t alpha, uint32_t* dst, uint32_t w)
   }
 
   const std::array<uint32_t, 2> tcw{{
-    gsl::narrow_cast<uint32_t>((d & 0xE0u) >> 5u),
-    gsl::narrow_cast<uint32_t>((d & 0x1Cu) >> 2u),
+    gsl_lite::narrow_cast<uint32_t>((d & 0xE0u) >> 5u),
+    gsl_lite::narrow_cast<uint32_t>((d & 0x1Cu) >> 2u),
   }};
 
   uint32_t b1 = (d >> 32u) & 0xFFFFu;
@@ -432,8 +434,8 @@ void decodeRgbaPart(uint64_t d, uint64_t alpha, uint32_t* dst, uint32_t w)
 
   uint32_t idx = b1 | (b2 << 1u);
 
-  const int32_t base = gsl::narrow_cast<uint8_t>(alpha >> 56u);
-  const int32_t mul = gsl::narrow_cast<uint8_t>((alpha >> 52u) & 0xFu);
+  const int32_t base = gsl_lite::narrow_cast<uint8_t>(alpha >> 56u);
+  const int32_t mul = gsl_lite::narrow_cast<uint8_t>((alpha >> 52u) & 0xFu);
   const auto& atbl = getAlpha()[(alpha >> 48u) & 0xFu];
 
   if(d & 0x1u)
@@ -523,4 +525,4 @@ std::shared_ptr<Bitmap> BlockData::decode()
   }
 
   return ret;
-}
+}
\ No newline at end of file
diff --git a/src/etcpak/math.hpp b/src/etcpak/math.hpp
index 171021575..f5cb5d22a 100644
--- a/src/etcpak/math.hpp
+++ b/src/etcpak/math.hpp
@@ -2,20 +2,20 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
-constexpr uint8_t clampu8(int32_t val)
+constexpr uint8_t clampu8(const int32_t val)
 {
-  return gsl::narrow_cast<uint8_t>(std::clamp(val, 0, 255));
+  return gsl_lite::narrow_cast<uint8_t>(std::clamp(val, 0, 255));
 }
 
-constexpr uint8_t clampu8(uint32_t val)
+constexpr uint8_t clampu8(const uint32_t val)
 {
-  return gsl::narrow_cast<uint8_t>(std::clamp(val, 0u, 255u));
+  return gsl_lite::narrow_cast<uint8_t>(std::clamp(val, 0u, 255u));
 }
 
 template<typename T>
 constexpr T sq(T val)
 {
   return val * val;
-}
+}
\ No newline at end of file
diff --git a/src/etcpak/processcommon.hpp b/src/etcpak/processcommon.hpp
index 5ee37fec9..f421cff65 100644
--- a/src/etcpak/processcommon.hpp
+++ b/src/etcpak/processcommon.hpp
@@ -17,7 +17,7 @@ constexpr size_t getLeastErrorIndex(const std::array<T, N>& err)
   return idx;
 }
 
-constexpr uint64_t fixByteOrder(uint64_t d)
+constexpr uint64_t fixByteOrder(const uint64_t d)
 {
   return ((d & 0x00000000FFFFFFFFu)) | ((d & 0xFF00000000000000u) >> 24u) | ((d & 0x000000FF00000000u) << 24u)
          | ((d & 0x00FF000000000000u) >> 8u) | ((d & 0x0000FF0000000000u) << 8u);
diff --git a/src/etcpak/processrgb.cpp b/src/etcpak/processrgb.cpp
index b5ee2cf09..68290551a 100644
--- a/src/etcpak/processrgb.cpp
+++ b/src/etcpak/processrgb.cpp
@@ -17,7 +17,7 @@
 #include <glm/ext/vector_uint4_sized.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <limits>
 #include <stdexcept>
 #include <tuple>
@@ -72,19 +72,20 @@ struct BgraVec
   uint8_t r;
   uint8_t a;
 };
+
 static_assert(sizeof(BgraVec) == 4);
 
-using BgraVecBlock = std::array<BgraVec, size_t(4u * 4u)>;
-static_assert(sizeof(BgraVecBlock) == size_t(4u * 4u) * sizeof(BgraVec));
+using BgraVecBlock = std::array<BgraVec, static_cast<size_t>(4u * 4u)>;
+static_assert(sizeof(BgraVecBlock) == static_cast<size_t>(4u * 4u) * sizeof(BgraVec));
 
 struct BgrVec
 {
   [[nodiscard]] static constexpr auto fromUnchecked(const glm::ivec3& rhs)
   {
     return BgrVec{
-      gsl::narrow_cast<uint8_t>(rhs.r),
-      gsl::narrow_cast<uint8_t>(rhs.g),
-      gsl::narrow_cast<uint8_t>(rhs.b),
+      gsl_lite::narrow_cast<uint8_t>(rhs.r),
+      gsl_lite::narrow_cast<uint8_t>(rhs.g),
+      gsl_lite::narrow_cast<uint8_t>(rhs.b),
     };
   }
 
@@ -92,39 +93,39 @@ struct BgrVec
   uint8_t g;
   uint8_t r;
 
-  [[nodiscard]] constexpr auto operator-(uint8_t rhs) const
+  [[nodiscard]] constexpr auto operator-(const uint8_t rhs) const
   {
     return BgrVec{
-      gsl::narrow_cast<uint8_t>(std::max(0, b - rhs)),
-      gsl::narrow_cast<uint8_t>(std::max(0, g - rhs)),
-      gsl::narrow_cast<uint8_t>(std::max(0, r - rhs)),
+      gsl_lite::narrow_cast<uint8_t>(std::max(0, b - rhs)),
+      gsl_lite::narrow_cast<uint8_t>(std::max(0, g - rhs)),
+      gsl_lite::narrow_cast<uint8_t>(std::max(0, r - rhs)),
     };
   }
 
-  [[nodiscard]] constexpr auto operator+(uint8_t rhs) const
+  [[nodiscard]] constexpr auto operator+(const uint8_t rhs) const
   {
     return BgrVec{
-      gsl::narrow_cast<uint8_t>(std::min(255, b - rhs)),
-      gsl::narrow_cast<uint8_t>(std::min(255, g - rhs)),
-      gsl::narrow_cast<uint8_t>(std::min(255, r - rhs)),
+      gsl_lite::narrow_cast<uint8_t>(std::min(255, b - rhs)),
+      gsl_lite::narrow_cast<uint8_t>(std::min(255, g - rhs)),
+      gsl_lite::narrow_cast<uint8_t>(std::min(255, r - rhs)),
     };
   }
 
-  [[nodiscard]] constexpr auto operator<<(uint8_t rhs) const
+  [[nodiscard]] constexpr auto operator<<(const uint8_t rhs) const
   {
     return BgrVec{
-      gsl::narrow_cast<uint8_t>(b << rhs),
-      gsl::narrow_cast<uint8_t>(g << rhs),
-      gsl::narrow_cast<uint8_t>(r << rhs),
+      gsl_lite::narrow_cast<uint8_t>(b << rhs),
+      gsl_lite::narrow_cast<uint8_t>(g << rhs),
+      gsl_lite::narrow_cast<uint8_t>(r << rhs),
     };
   }
 
   [[nodiscard]] constexpr auto operator|(const BgrVec& rhs) const
   {
     return BgrVec{
-      gsl::narrow_cast<uint8_t>(b | rhs.b),
-      gsl::narrow_cast<uint8_t>(g | rhs.g),
-      gsl::narrow_cast<uint8_t>(r | rhs.r),
+      gsl_lite::narrow_cast<uint8_t>(b | rhs.b),
+      gsl_lite::narrow_cast<uint8_t>(g | rhs.g),
+      gsl_lite::narrow_cast<uint8_t>(r | rhs.r),
     };
   }
 
@@ -161,7 +162,7 @@ void insertionSort(std::array<uint8_t, 16>& values, std::array<uint8_t, 16>& ind
 //converts indices from  |a0|a1|e0|e1|i0|i1|m0|m1|b0|b1|f0|f1|j0|j1|n0|n1|c0|c1|g0|g1|k0|k1|o0|o1|d0|d1|h0|h1|l0|l1|p0|p1| previously used by T- and H-modes
 //                     into  |p0|o0|n0|m0|l0|k0|j0|i0|h0|g0|f0|e0|d0|c0|b0|a0|p1|o1|n1|m1|l1|k1|j1|i1|h1|g1|f1|e1|d1|c1|b1|a1| which should be used for all modes.
 // NO WARRANTY --- SEE STATEMENT IN TOP OF FILE (C) Ericsson AB 2005-2013. All Rights Reserved.
-uint32_t indexConversion(uint32_t pixelIndices)
+uint32_t indexConversion(const uint32_t pixelIndices)
 {
   uint32_t correctIndices = 0;
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
@@ -194,7 +195,7 @@ uint32_t indexConversion(uint32_t pixelIndices)
 }
 
 // calculates quantized colors for T or H modes
-std::array<BgrVec, 2> compressColor(const std::array<BgrVec, 2>& currColorBgr, bool tMode)
+std::array<BgrVec, 2> compressColor(const std::array<BgrVec, 2>& currColorBgr, const bool tMode)
 {
   return {
     tMode ? BgrVec::fromUnchecked(glm::min(15 * (currColorBgr[0].toGlmIVec() + 8) / 255, 15))
@@ -220,7 +221,7 @@ std::array<BgrVec, 2> decompressColor(const std::array<BgrVec, 2>& colorsBGR444)
   }};
 }
 
-std::array<BgrVec, 4> calculatePaintColors58H(uint8_t d, const std::array<BgrVec, 2>& bgr)
+std::array<BgrVec, 4> calculatePaintColors58H(const uint8_t d, const std::array<BgrVec, 2>& bgr)
 {
   return {
     // C1
@@ -235,7 +236,7 @@ std::array<BgrVec, 4> calculatePaintColors58H(uint8_t d, const std::array<BgrVec
 
 // calculates the paint colors from the block colors
 // using a distance d and one of the H- or T-patterns.
-std::array<BgrVec, 4> calculatePaintColors59T(uint8_t d, const std::array<BgrVec, 2>& bgr)
+std::array<BgrVec, 4> calculatePaintColors59T(const uint8_t d, const std::array<BgrVec, 2>& bgr)
 {
   //////////////////////////////////////////////
   //
@@ -327,13 +328,12 @@ std::array<std::array<uint32_t, 4>, 4> sumHalvesBgr(const BgraBlockImm& bgra)
   (y03x03_2 + y47x03_2).storeu(&err[3]);
 
   std::array<std::array<uint32_t, 4>, 4> result{};
-  std::transform(err.begin(),
-                 err.end(),
-                 result.begin(),
-                 [](const __m128i& x)
-                 {
-                   return *reinterpret_cast<const std::array<uint32_t, 4>*>(&x);
-                 });
+  std::ranges::transform(err,
+                         result.begin(),
+                         [](const __m128i& x)
+                         {
+                           return *reinterpret_cast<const std::array<uint32_t, 4>*>(&x);
+                         });
 
   return result;
 }
@@ -379,7 +379,7 @@ std::array<glm::u16vec4, 8> processAverages(const std::array<IVec16, 2>& avgPerH
   return result;
 }
 
-void encodeAverages(uint64_t& _d, const std::array<glm::u16vec4, 8>& avgRgb, size_t idx)
+void encodeAverages(uint64_t& _d, const std::array<glm::u16vec4, 8>& avgRgb, const size_t idx)
 {
   auto d = _d | (idx << 24u);
   const size_t base = idx << 1u;
@@ -388,18 +388,18 @@ void encodeAverages(uint64_t& _d, const std::array<glm::u16vec4, 8>& avgRgb, siz
   {
     for(uint8_t i = 0; i < 3; i++)
     {
-      d |= uint64_t(avgRgb[base + 0][i] >> 4u) << (i * 8u);
-      d |= uint64_t(avgRgb[base + 1][i] >> 4u) << (i * 8u + 4u);
+      d |= static_cast<uint64_t>(avgRgb[base + 0][i] >> 4u) << (i * 8u);
+      d |= static_cast<uint64_t>(avgRgb[base + 1][i] >> 4u) << (i * 8u + 4u);
     }
   }
   else
   {
     for(uint8_t i = 0; i < 3; i++)
     {
-      d |= uint64_t(avgRgb[base + 1][i] & 0xF8u) << (i * 8u);
+      d |= static_cast<uint64_t>(avgRgb[base + 1][i] & 0xF8u) << (i * 8u);
       uint32_t c = ((avgRgb[base + 0][i] & 0xF8u) - (avgRgb[base + 1][i] & 0xF8u)) >> 3u;
       c &= 7u;
-      d |= ((uint64_t)c) << (i * 8u);
+      d |= static_cast<uint64_t>(c) << (i * 8u);
     }
   }
   _d = d;
@@ -407,24 +407,23 @@ void encodeAverages(uint64_t& _d, const std::array<glm::u16vec4, 8>& avgRgb, siz
 
 uint32_t checkSolid(const BgraBlockImm& bgra)
 {
-  auto d0 = bgra[0];
-  auto d1 = bgra[1];
-  auto d2 = bgra[2];
-  auto d3 = bgra[3];
-
-  auto c = d0.shuffled32<0, 0, 0, 0>();
+  const auto d0 = bgra[0];
+  const auto d1 = bgra[1];
+  const auto d2 = bgra[2];
+  const auto d3 = bgra[3];
 
-  auto m = (d0 == c) & (d1 == c) & (d2 == c) & (d3 == c);
+  const auto c = d0.shuffled32<0, 0, 0, 0>();
 
-  if(!m.testC(IVec{-1}))
+  if(const auto m = (d0 == c) & (d1 == c) & (d2 == c) & (d3 == c); !m.testC(IVec{-1}))
   {
     return 0;
   }
 
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
   std::array<uint8_t, sizeof(__m128i)> tmp;
-  (bgra[0] & IVec8{uint8_t(0xf8)}).storeu(&tmp);
-  return 0x02000000u | ((uint32_t)tmp[0] << 16u) | ((uint32_t)tmp[1] << 8u) | ((uint32_t)tmp[2]);
+  (bgra[0] & IVec8{static_cast<uint8_t>(0xf8)}).storeu(&tmp);
+  return 0x02000000u | (static_cast<uint32_t>(tmp[0]) << 16u) | (static_cast<uint32_t>(tmp[1]) << 8u)
+         | static_cast<uint32_t>(tmp[2]);
 }
 
 std::tuple<std::array<glm::u16vec4, 8>, std::array<uint32_t, 4>> prepareAverages(const BgraBlockImm& immBgra)
@@ -467,7 +466,7 @@ std::tuple<std::array<std::array<uint32_t, 8>, 2>, std::array<std::array<uint16_
 
     // The scaling values are divided by two and rounded, to allow the differences to be in the range of signed int16
     // This produces slightly different results, but is significant faster
-    auto pixel = IVec16{gsl::narrow_cast<int16_t>(dr * LumaWeightR + dg * LumaWeightG + db * LumaWeightB)};
+    auto pixel = IVec16{gsl_lite::narrow_cast<int16_t>(dr * LumaWeightR + dg * LumaWeightG + db * LumaWeightB)};
     auto pix = pixel.abs();
 
     // Taking the absolute value is way faster. The values are only used to sort, so the result will be the same.
@@ -508,16 +507,16 @@ std::tuple<std::array<std::array<uint32_t, 8>, 2>, std::array<std::array<uint16_
   return {terr, tsel};
 }
 
-uint8_t convert6(float f)
+uint8_t convert6(const float f)
 {
   const int i = (std::clamp(static_cast<int>(f), 0, 1023) - 15) >> 1;
-  return gsl::narrow_cast<uint8_t>((i + 11 - ((i + 11) >> 7) - ((i + 4) >> 7)) >> 3);
+  return gsl_lite::narrow_cast<uint8_t>((i + 11 - ((i + 11) >> 7) - ((i + 4) >> 7)) >> 3);
 }
 
-uint8_t convert7(float f)
+uint8_t convert7(const float f)
 {
   const int i = (std::clamp(static_cast<int>(f), 0, 1023) - 15) >> 1;
-  return gsl::narrow_cast<uint8_t>((i + 9 - ((i + 9) >> 8) - ((i + 6) >> 8)) >> 2);
+  return gsl_lite::narrow_cast<uint8_t>((i + 9 - ((i + 9) >> 8) - ((i + 6) >> 8)) >> 2);
 }
 
 std::pair<uint64_t, uint64_t> planar(const BgraVecBlock& bgra, const uint8_t mode, bool useHeuristics)
@@ -544,9 +543,9 @@ std::pair<uint64_t, uint64_t> planar(const BgraVecBlock& bgra, const uint8_t mod
 
   for(size_t i = 0; i < bgra.size(); ++i)
   {
-    const int32_t difB = gsl::narrow_cast<int>(bgra[i].b << 4u) - b;
-    const int32_t difG = gsl::narrow_cast<int>(bgra[i].g << 4u) - g;
-    const int32_t difR = gsl::narrow_cast<int>(bgra[i].r << 4u) - r;
+    const int32_t difB = gsl_lite::narrow_cast<int>(bgra[i].b << 4u) - b;
+    const int32_t difG = gsl_lite::narrow_cast<int>(bgra[i].g << 4u) - g;
+    const int32_t difR = gsl_lite::narrow_cast<int>(bgra[i].r << 4u) - r;
 
     difRyz += difR * scaling[i % 4u];
     difGyz += difG * scaling[i % 4u];
@@ -557,19 +556,19 @@ std::pair<uint64_t, uint64_t> planar(const BgraVecBlock& bgra, const uint8_t mod
     difBxz += difB * scaling[i / 4u];
   }
 
-  static const float scale = -4.0f / ((255 * 255 * 8.0f + 85 * 85 * 8.0f) * 16.0f);
+  static constexpr float scale = -4.0f / ((255 * 255 * 8.0f + 85 * 85 * 8.0f) * 16.0f);
 
-  const float aR = gsl::narrow_cast<float>(difRxz) * scale;
-  const float aG = gsl::narrow_cast<float>(difGxz) * scale;
-  const float aB = gsl::narrow_cast<float>(difBxz) * scale;
+  const float aR = gsl_lite::narrow_cast<float>(difRxz) * scale;
+  const float aG = gsl_lite::narrow_cast<float>(difGxz) * scale;
+  const float aB = gsl_lite::narrow_cast<float>(difBxz) * scale;
 
-  const float bR = gsl::narrow_cast<float>(difRyz) * scale;
-  const float bG = gsl::narrow_cast<float>(difGyz) * scale;
-  const float bB = gsl::narrow_cast<float>(difByz) * scale;
+  const float bR = gsl_lite::narrow_cast<float>(difRyz) * scale;
+  const float bG = gsl_lite::narrow_cast<float>(difGyz) * scale;
+  const float bB = gsl_lite::narrow_cast<float>(difByz) * scale;
 
-  const float dR = gsl::narrow_cast<float>(r) * (4.0f / 16.0f);
-  const float dG = gsl::narrow_cast<float>(g) * (4.0f / 16.0f);
-  const float dB = gsl::narrow_cast<float>(b) * (4.0f / 16.0f);
+  const float dR = gsl_lite::narrow_cast<float>(r) * (4.0f / 16.0f);
+  const float dG = gsl_lite::narrow_cast<float>(g) * (4.0f / 16.0f);
+  const float dB = gsl_lite::narrow_cast<float>(b) * (4.0f / 16.0f);
 
   // calculating the three colors RGBO, RGBH, and RGBV.  RGB = df - af * x - bf * y;
   const float cofR = std::fma(aR, 255.0f, std::fma(bR, 255.0f, dR));
@@ -663,16 +662,16 @@ std::pair<uint64_t, uint64_t> planar(const BgraVecBlock& bgra, const uint8_t mod
   return std::make_pair(result, error);
 }
 
-uint32_t calculateErrorTH(bool tMode,
+uint32_t calculateErrorTH(const bool tMode,
                           const BgraVecBlock& bgra,
                           const std::array<BgrVec, 2>& colorsBGR444,
                           uint8_t& dist,
                           uint32_t& pixIndices,
-                          uint8_t startDist)
+                          const uint8_t startDist)
 {
   uint32_t bestBlockErr = MaxError;
 
-  auto colors = decompressColor(colorsBGR444);
+  const auto colors = decompressColor(colorsBGR444);
 
   // test distances
   for(uint8_t d = startDist; d < 8; ++d)
@@ -702,10 +701,9 @@ uint32_t calculateErrorTH(bool tMode,
           };
 
           const uint32_t err = LumaWeightR * abs(diff.r) + LumaWeightG * abs(diff.g) + LumaWeightB * abs(diff.b);
-          const uint32_t pixErr = err * err;
 
           // Choose best error
-          if(pixErr < bestPixErr)
+          if(const uint32_t pixErr = err * err; pixErr < bestPixErr)
           {
             bestPixErr = pixErr;
             pixColors ^= (pixColors & 3u); // Reset the two first bits
@@ -744,11 +742,10 @@ uint32_t compressBlockTH(const BgraVecBlock& bgra, Luma& l, uint32_t& compressed
   uint16_t minSumRangeValue = luma[15] - luma[1] + diffBonus[0];
 
   {
-    const auto temp = gsl::narrow_cast<int16_t>(luma[15] - luma[0]);
-    for(uint8_t i = 1; i < gsl::narrow_cast<uint8_t>(luma.size() - 1u); i++)
+    const auto temp = gsl_lite::narrow_cast<int16_t>(luma[15] - luma[0]);
+    for(uint8_t i = 1; i < gsl_lite::narrow_cast<uint8_t>(luma.size() - 1u); i++)
     {
-      const uint16_t sum = temp - luma[i + 1] + luma[i] + diffBonus[i];
-      if(minSumRangeValue > sum)
+      if(const uint16_t sum = temp - luma[i + 1] + luma[i] + diffBonus[i]; minSumRangeValue > sum)
       {
         minSumRangeValue = sum;
         minSumRangeIdx = i;
@@ -796,9 +793,9 @@ uint32_t compressBlockTH(const BgraVecBlock& bgra, Luma& l, uint32_t& compressed
   std::array<BgrVec, 2> midBgr;
   if(swap)
   {
-    midBgr[1].b = gsl::narrow_cast<uint8_t>((b[0] + b[1]) / 2);
-    midBgr[1].g = gsl::narrow_cast<uint8_t>((g[0] + g[1]) / 2);
-    midBgr[1].r = gsl::narrow_cast<uint8_t>((r[0] + r[1]) / 2);
+    midBgr[1].b = gsl_lite::narrow_cast<uint8_t>((b[0] + b[1]) / 2);
+    midBgr[1].g = gsl_lite::narrow_cast<uint8_t>((g[0] + g[1]) / 2);
+    midBgr[1].r = gsl_lite::narrow_cast<uint8_t>((r[0] + r[1]) / 2);
 
     glm::u16vec3 sumBgr{0, 0, 0};
     for(uint8_t i = minSumRangeIdx + 1; i < 16; i++)
@@ -809,15 +806,15 @@ uint32_t compressBlockTH(const BgraVecBlock& bgra, Luma& l, uint32_t& compressed
       sumBgr.r += bgra[idx].r;
     }
     const uint8_t temp = 15 - minSumRangeIdx;
-    midBgr[0].b = gsl::narrow_cast<uint8_t>(sumBgr.b / temp);
-    midBgr[0].g = gsl::narrow_cast<uint8_t>(sumBgr.g / temp);
-    midBgr[0].r = gsl::narrow_cast<uint8_t>(sumBgr.r / temp);
+    midBgr[0].b = gsl_lite::narrow_cast<uint8_t>(sumBgr.b / temp);
+    midBgr[0].g = gsl_lite::narrow_cast<uint8_t>(sumBgr.g / temp);
+    midBgr[0].r = gsl_lite::narrow_cast<uint8_t>(sumBgr.r / temp);
   }
   else
   {
-    midBgr[0].b = gsl::narrow_cast<uint8_t>((b[0] + b[1]) / 2);
-    midBgr[0].g = gsl::narrow_cast<uint8_t>((g[0] + g[1]) / 2);
-    midBgr[0].r = gsl::narrow_cast<uint8_t>((r[0] + r[1]) / 2);
+    midBgr[0].b = gsl_lite::narrow_cast<uint8_t>((b[0] + b[1]) / 2);
+    midBgr[0].g = gsl_lite::narrow_cast<uint8_t>((g[0] + g[1]) / 2);
+    midBgr[0].r = gsl_lite::narrow_cast<uint8_t>((r[0] + r[1]) / 2);
     if(tMode)
     {
       glm::u16vec3 sumBgr{0, 0, 0};
@@ -829,15 +826,15 @@ uint32_t compressBlockTH(const BgraVecBlock& bgra, Luma& l, uint32_t& compressed
         sumBgr.r += bgra[idx].r;
       }
       const uint8_t temp = 15 - minSumRangeIdx;
-      midBgr[1].b = gsl::narrow_cast<uint8_t>(sumBgr.b / temp);
-      midBgr[1].g = gsl::narrow_cast<uint8_t>(sumBgr.g / temp);
-      midBgr[1].r = gsl::narrow_cast<uint8_t>(sumBgr.r / temp);
+      midBgr[1].b = gsl_lite::narrow_cast<uint8_t>(sumBgr.b / temp);
+      midBgr[1].g = gsl_lite::narrow_cast<uint8_t>(sumBgr.g / temp);
+      midBgr[1].r = gsl_lite::narrow_cast<uint8_t>(sumBgr.r / temp);
     }
     else
     {
-      midBgr[1].b = gsl::narrow_cast<uint8_t>((b[2] + b[3]) / 2u);
-      midBgr[1].g = gsl::narrow_cast<uint8_t>((g[2] + g[3]) / 2u);
-      midBgr[1].r = gsl::narrow_cast<uint8_t>((r[2] + r[3]) / 2u);
+      midBgr[1].b = gsl_lite::narrow_cast<uint8_t>((b[2] + b[3]) / 2u);
+      midBgr[1].g = gsl_lite::narrow_cast<uint8_t>((g[2] + g[3]) / 2u);
+      midBgr[1].r = gsl_lite::narrow_cast<uint8_t>((r[2] + r[3]) / 2u);
     }
   }
 
@@ -937,7 +934,7 @@ uint64_t encodeSelectors(uint64_t d,
                          const uint64_t value,
                          const uint64_t error)
 {
-  std::array<size_t, 2> tidx{{
+  const std::array<size_t, 2> tidx{{
     getLeastErrorIndex(terr[0]),
     getLeastErrorIndex(terr[1]),
   }};
@@ -962,7 +959,7 @@ uint64_t encodeSelectors(uint64_t d,
 // During search it is not convenient to store the bits the way they are stored in the
 // file format. Hence, after search, it is converted to this format.
 // NO WARRANTY --- SEE STATEMENT IN TOP OF FILE (C) Ericsson AB 2005-2013. All Rights Reserved.
-inline void stuff59bits(uint32_t thumbT59W1, uint32_t thumbT59W2, uint32_t& thumbTW1, uint32_t& thumbTW2)
+void stuff59bits(const uint32_t thumbT59W1, const uint32_t thumbT59W2, uint32_t& thumbTW1, uint32_t& thumbTW2)
 {
   // Put bits in twotimer configuration for 59 (red overflows)
   //
@@ -1021,7 +1018,7 @@ inline void stuff59bits(uint32_t thumbT59W1, uint32_t thumbT59W2, uint32_t& thum
 // During search it is not convenient to store the bits the way they are stored in the
 // file format. Hence, after search, it is converted to this format.
 // NO WARRANTY --- SEE STATEMENT IN TOP OF FILE (C) Ericsson AB 2005-2013. All Rights Reserved.
-inline void stuff58bits(uint32_t thumbH58W1, uint32_t thumbH58W2, uint32_t& thumbHW1, uint32_t& thumbHW2)
+void stuff58bits(const uint32_t thumbH58W1, const uint32_t thumbH58W2, uint32_t& thumbHW1, uint32_t& thumbHW2)
 {
   // Put bits in twotimer configuration for 58 (red doesn't overflow, green does)
   //
@@ -1064,21 +1061,18 @@ inline void stuff58bits(uint32_t thumbH58W1, uint32_t thumbH58W2, uint32_t& thum
   //     |//|part0               |// // //|part1|//|part2                                          |df|part3|
   //      --------------------------------------------------------------------------------------------------|
 
-  uint8_t bit;
-
   // move parts
   const auto part0 = (thumbH58W1 >> 19u) & 0x7fu;
   const auto part1 = (thumbH58W1 >> 17u) & 0x3u;
   const auto part2 = (thumbH58W1 >> 1u) & 0xffffu;
   const auto part3 = thumbH58W1 & 0x1u;
-  thumbHW1 = 0;
-  thumbHW1 = (thumbHW1 & ~(0x7fu << 24u)) | ((part0 & 0x7fu) << 24u);
+  thumbHW1 = (part0 & 0x7fu) << 24u;
   thumbHW1 = (thumbHW1 & ~(0x3u << 19u)) | ((part1 & 0x3u) << 19u);
   thumbHW1 = (thumbHW1 & ~(0xffffu << 2u)) | ((part2 & 0xffffu) << 2u);
   thumbHW1 = (thumbHW1 & ~0x1u) | (part3 & 0x1u);
 
   // Make sure that red does not overflow:
-  bit = (thumbHW1 >> 30u) & 0x1u;
+  uint8_t bit = (thumbHW1 >> 30u) & 0x1u;
   thumbHW1 = (thumbHW1 & ~(0x1u << 31u)) | ((~bit & 0x1u) << 31u);
 
   // Make sure that green overflows:
@@ -1127,9 +1121,8 @@ void calculateLuma(const BgraBlockImm& immBgra, Luma& luma)
 
 uint8_t selectModeETC2(const Luma& luma)
 {
-  const float lumaRange = gsl::narrow_cast<float>(luma.max - luma.min) / 255.0f;
   // filters a very-low-contrast block
-  if(lumaRange <= ecmdThreshold[0])
+  if(const float lumaRange = gsl_lite::narrow_cast<float>(luma.max - luma.min) / 255.0f; lumaRange <= ecmdThreshold[0])
   {
     return ModePlanar;
   }
@@ -1153,7 +1146,7 @@ uint8_t selectModeETC2(const Luma& luma)
   return ModeUndecided;
 }
 
-uint64_t processBGR_ETC2(const BgraVecBlock& bgra, const BgraBlockImm& immRgba, bool useHeuristics)
+uint64_t processBGR_ETC2(const BgraVecBlock& bgra, const BgraBlockImm& immRgba, const bool useHeuristics)
 {
   uint64_t d = checkSolid(immRgba);
   if(d != 0)
@@ -1194,7 +1187,7 @@ uint64_t processBGR_ETC2(const BgraVecBlock& bgra, const BgraBlockImm& immRgba,
         stuff58bits(compressed[0], compressed[1], compressed[2], compressed[3]);
       }
 
-      encoded = (uint32_t)_bswap(compressed[2]);
+      encoded = static_cast<uint32_t>(_bswap(compressed[2]));
       encoded |= static_cast<uint64_t>(_bswap(compressed[3])) << 32u;
     }
     else
@@ -1219,7 +1212,7 @@ IVec16 widen(const IVec16& src)
   return IVec16{_mm_shuffle_epi32(tmp, _MM_SHUFFLE(s2, s2, s2, s2))};
 }
 
-constexpr int getMulSel(size_t sel)
+constexpr int getMulSel(const size_t sel)
 {
   switch(sel)
   {
@@ -1378,7 +1371,7 @@ uint64_t processAlpha_ETC2(const IVec8& alphas)
       const auto err1 = sri - recVal16;
       const auto err2 = err1 * err1;
       const auto minerr = err2.minPos();
-      rangeErr += gsl::narrow_cast<int>(minerr.get64() & 0xFFFFu);
+      rangeErr += gsl_lite::narrow_cast<int>(minerr.get64() & 0xFFFFu);
     }
 
     if(rangeErr < err)
@@ -1405,15 +1398,17 @@ uint64_t processAlpha_ETC2(const IVec8& alphas)
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
   std::array<uint16_t, sizeof(__m128i) / sizeof(uint16_t)> rm;
   mul.storeu(&rm);
-  const auto sm = gsl::narrow_cast<uint16_t>(srcMid.get64());
+  const auto sm = gsl_lite::narrow_cast<uint16_t>(srcMid.get64());
 
-  const uint64_t d = (uint64_t(sm) << 56u) | (uint64_t(rm[getMulSel(sel)]) << 52u) | (uint64_t(sel) << 48u) | idx;
+  const uint64_t d = (static_cast<uint64_t>(sm) << 56u) | (static_cast<uint64_t>(rm[getMulSel(sel)]) << 52u)
+                     | (static_cast<uint64_t>(sel) << 48u) | idx;
 
   return _bswap64(d);
 }
 } // namespace
 
-void compressEtc2Bgra(const uint32_t* srcBgra, uint64_t* dst, uint32_t blocks, size_t width, bool useHeuristics)
+void compressEtc2Bgra(
+  const uint32_t* srcBgra, uint64_t* dst, uint32_t blocks, const size_t width, const bool useHeuristics)
 {
   int w = 0;
   while(blocks--)
@@ -1458,4 +1453,4 @@ void compressEtc2Bgra(const uint32_t* srcBgra, uint64_t* dst, uint32_t blocks, s
     *dst++ = processAlpha_ETC2(alphas);
     *dst++ = processBGR_ETC2(bgra, immRgba, useHeuristics);
   }
-}
+}
\ No newline at end of file
diff --git a/src/etcpak/processrgb.hpp b/src/etcpak/processrgb.hpp
index 0672a1f06..0f3c14603 100644
--- a/src/etcpak/processrgb.hpp
+++ b/src/etcpak/processrgb.hpp
@@ -3,4 +3,4 @@
 #include <cstddef>
 #include <cstdint>
 
-extern void compressEtc2Bgra(const uint32_t* bgra, uint64_t* dst, uint32_t blocks, size_t width, bool useHeuristics);
+extern void compressEtc2Bgra(const uint32_t* srcBgra, uint64_t* dst, uint32_t blocks, size_t width, bool useHeuristics);
diff --git a/src/etcpak/ssevec.h b/src/etcpak/ssevec.h
index 9710b2c32..5ad60ffac 100644
--- a/src/etcpak/ssevec.h
+++ b/src/etcpak/ssevec.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <emmintrin.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <smmintrin.h>
 #include <tmmintrin.h>
 #include <xmmintrin.h>
@@ -26,17 +26,17 @@ struct IVec final
     static_assert(sizeof(T) == sizeof(__m128i));
   }
 
-  explicit IVec(__m128i x)
+  explicit IVec(const __m128i x)
       : data{x}
   {
   }
 
-  explicit IVec(int32_t x)
+  explicit IVec(const int32_t x)
       : data{_mm_set1_epi32(x)}
   {
   }
 
-  explicit IVec(int32_t x, int32_t y, int32_t z, int32_t w)
+  explicit IVec(const int32_t x, const int32_t y, const int32_t z, const int32_t w)
       : data{_mm_setr_epi32(x, y, z, w)}
   {
   }
@@ -75,7 +75,7 @@ struct IVec final
     return IVec{_mm_mul_epi32(data, rhs.data)};
   }
 
-  [[nodiscard]] IVec operator>>(int n) const
+  [[nodiscard]] IVec operator>>(const int n) const
   {
     return IVec{_mm_srli_epi32(data, n)};
   }
@@ -131,18 +131,24 @@ struct IVec final
 
 struct IVec16 final
 {
-  explicit IVec16(__m128i x) noexcept
+  explicit IVec16(const __m128i x) noexcept
       : data{x}
   {
   }
 
-  explicit IVec16(int16_t x = 0) noexcept
+  explicit IVec16(const int16_t x = 0) noexcept
       : data{_mm_set1_epi16(x)}
   {
   }
 
-  explicit IVec16(
-    int16_t x0, int16_t x1, int16_t x2, int16_t x3, int16_t x4, int16_t x5, int16_t x6, int16_t x7) noexcept
+  explicit IVec16(const int16_t x0,
+                  const int16_t x1,
+                  const int16_t x2,
+                  const int16_t x3,
+                  const int16_t x4,
+                  const int16_t x5,
+                  const int16_t x6,
+                  const int16_t x7) noexcept
       : data{_mm_setr_epi16(x0, x1, x2, x3, x4, x5, x6, x7)}
   {
   }
@@ -192,17 +198,17 @@ struct IVec16 final
     return IVec16{_mm_and_si128(data, rhs.data)};
   }
 
-  [[nodiscard]] IVec16 operator>>(int n) const
+  [[nodiscard]] IVec16 operator>>(const int n) const
   {
     return IVec16{_mm_srli_epi16(data, n)};
   }
 
-  [[nodiscard]] IVec16 sra(int n) const
+  [[nodiscard]] IVec16 sra(const int n) const
   {
     return IVec16{_mm_srai_epi16(data, n)};
   }
 
-  [[nodiscard]] IVec16 operator<<(int n) const
+  [[nodiscard]] IVec16 operator<<(const int n) const
   {
     return IVec16{_mm_slli_epi16(data, n)};
   }
@@ -289,7 +295,7 @@ struct IVec16 final
 
 struct IVec8 final
 {
-  explicit IVec8(__m128i x)
+  explicit IVec8(const __m128i x)
       : data{x}
   {
   }
@@ -299,13 +305,13 @@ struct IVec8 final
   {
   }
 
-  explicit IVec8(int8_t x)
+  explicit IVec8(const int8_t x)
       : data{_mm_set1_epi8(x)}
   {
   }
 
   explicit IVec8(uint8_t x)
-      : data{_mm_set1_epi8(gsl::narrow_cast<int8_t>(x))}
+      : data{_mm_set1_epi8(gsl_lite::narrow_cast<int8_t>(x))}
   {
   }
 
@@ -322,7 +328,7 @@ struct IVec8 final
     return IVec8{_mm_cmpeq_epi8(data, rhs.data)};
   }
 
-  [[nodiscard]] auto operator&(int rhs) const
+  [[nodiscard]] auto operator&(const int rhs) const
   {
     return IVec8{_mm_and_si128(data, _mm_set1_epi32(rhs))};
   }
@@ -413,12 +419,12 @@ IVec8 IVec16::toIVec8U(const IVec16& high) const
 
 IVec IVec16::lowToIVec32() const
 {
-  return lowToIVec32(IVec16{int16_t(0)});
+  return lowToIVec32(IVec16{static_cast<int16_t>(0)});
 }
 
 IVec IVec16::highToIVec32() const
 {
-  return highToIVec32(IVec16{int16_t(0)});
+  return highToIVec32(IVec16{static_cast<int16_t>(0)});
 }
 
 inline void transpose(IVec8& a, IVec8& b, IVec8& c, IVec8& d)
@@ -432,4 +438,4 @@ inline void transpose(IVec8& a, IVec8& b, IVec8& c, IVec8& d)
   b.data = _mm_castps_si128(tb);
   c.data = _mm_castps_si128(tc);
   d.data = _mm_castps_si128(td);
-}
+}
\ No newline at end of file
diff --git a/src/etcpak/tables.cpp b/src/etcpak/tables.cpp
index 3633b93c6..70190269f 100644
--- a/src/etcpak/tables.cpp
+++ b/src/etcpak/tables.cpp
@@ -4,29 +4,29 @@
 
 #include <array>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace
 {
 const std::array<int16_t, 16>& getAlphaRange()
 {
   static const std::array<int16_t, 16> alphaRange{{
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[0][7] - getAlpha()[0][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[1][7] - getAlpha()[1][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[2][7] - getAlpha()[2][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[3][7] - getAlpha()[3][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[4][7] - getAlpha()[4][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[5][7] - getAlpha()[5][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[6][7] - getAlpha()[6][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[7][7] - getAlpha()[7][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[8][7] - getAlpha()[8][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[9][7] - getAlpha()[9][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[10][7] - getAlpha()[10][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[11][7] - getAlpha()[11][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[12][7] - getAlpha()[12][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[13][7] - getAlpha()[13][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[14][7] - getAlpha()[14][3])),
-    gsl::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[15][7] - getAlpha()[15][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[0][7] - getAlpha()[0][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[1][7] - getAlpha()[1][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[2][7] - getAlpha()[2][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[3][7] - getAlpha()[3][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[4][7] - getAlpha()[4][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[5][7] - getAlpha()[5][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[6][7] - getAlpha()[6][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[7][7] - getAlpha()[7][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[8][7] - getAlpha()[8][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[9][7] - getAlpha()[9][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[10][7] - getAlpha()[10][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[11][7] - getAlpha()[11][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[12][7] - getAlpha()[12][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[13][7] - getAlpha()[13][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[14][7] - getAlpha()[14][3])),
+    gsl_lite::narrow_cast<int16_t>(0x100FF / (1 + getAlpha()[15][7] - getAlpha()[15][3])),
   }};
   return alphaRange;
 }
@@ -34,7 +34,7 @@ const std::array<int16_t, 16>& getAlphaRange()
 
 const std::array<std::array<int32_t, 4>, 8>& getTable()
 {
-  static const std::array<std::array<int32_t, 4>, 8> table{{
+  static constexpr std::array<std::array<int32_t, 4>, 8> table{{
     {2, 8, -2, -8},
     {5, 17, -5, -17},
     {9, 29, -9, -29},
@@ -49,7 +49,7 @@ const std::array<std::array<int32_t, 4>, 8>& getTable()
 
 const std::array<std::array<uint32_t, 16>, 4>& getId()
 {
-  static const std::array<std::array<uint32_t, 16>, 4> id{{
+  static constexpr std::array<std::array<uint32_t, 16>, 4> id{{
     {1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0},
     {3, 3, 2, 2, 3, 3, 2, 2, 3, 3, 2, 2, 3, 3, 2, 2},
     {5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4},
@@ -60,7 +60,7 @@ const std::array<std::array<uint32_t, 16>, 4>& getId()
 
 const std::array<uint32_t, 64>& getFlags()
 {
-  static const std::array<uint32_t, 64> flags{
+  static constexpr std::array<uint32_t, 64> flags{
     {0x80800402, 0x80800402, 0x80800402, 0x80800402, 0x80800402, 0x80800402, 0x80800402, 0x8080E002,
      0x80800402, 0x80800402, 0x8080E002, 0x8080E002, 0x80800402, 0x8080E002, 0x8080E002, 0x8080E002,
      0x80000402, 0x80000402, 0x80000402, 0x80000402, 0x80000402, 0x80000402, 0x80000402, 0x8000E002,
@@ -74,7 +74,7 @@ const std::array<uint32_t, 64>& getFlags()
 
 const std::array<std::array<int16_t, 8>, 16>& getAlpha()
 {
-  static const std::array<std::array<int16_t, 8>, 16> alpha{{
+  static constexpr std::array<std::array<int16_t, 8>, 16> alpha{{
     {-3, -6, -9, -15, 2, 5, 8, 14},
     {-3, -7, -10, -13, 2, 6, 9, 12},
     {-2, -5, -8, -13, 1, 4, 7, 12},
@@ -241,13 +241,13 @@ const std::array<IVec16, 16>& getAlpha_SIMD()
 
 const IVec16& getAlphaRange_SIMD()
 {
-  static const IVec16 alphaRange_SIMD = IVec16{getAlphaRange()[0],
-                                               getAlphaRange()[1],
-                                               getAlphaRange()[4],
-                                               getAlphaRange()[5],
-                                               getAlphaRange()[8],
-                                               getAlphaRange()[14],
-                                               0,
-                                               0};
+  static const auto alphaRange_SIMD = IVec16{getAlphaRange()[0],
+                                             getAlphaRange()[1],
+                                             getAlphaRange()[4],
+                                             getAlphaRange()[5],
+                                             getAlphaRange()[8],
+                                             getAlphaRange()[14],
+                                             0,
+                                             0};
   return alphaRange_SIMD;
-}
+}
\ No newline at end of file
diff --git a/src/ffmpeg/avframeptr.cpp b/src/ffmpeg/avframeptr.cpp
index b6d976154..9ad2520c3 100644
--- a/src/ffmpeg/avframeptr.cpp
+++ b/src/ffmpeg/avframeptr.cpp
@@ -1,6 +1,6 @@
 #include "avframeptr.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <utility>
 
 extern "C"
@@ -37,4 +37,4 @@ AVFramePtr::~AVFramePtr()
 {
   av_frame_free(&frame);
 }
-} // namespace ffmpeg
+} // namespace ffmpeg
\ No newline at end of file
diff --git a/src/ffmpeg/stream.cpp b/src/ffmpeg/stream.cpp
index b3acdd6c6..abcaebc9f 100644
--- a/src/ffmpeg/stream.cpp
+++ b/src/ffmpeg/stream.cpp
@@ -15,7 +15,7 @@ extern "C"
 
 namespace ffmpeg
 {
-Stream::Stream(AVFormatContext* fmtContext, AVMediaType type, bool rplFakeAudioHack)
+Stream::Stream(AVFormatContext* fmtContext, const AVMediaType type, const bool rplFakeAudioHack)
     : index{av_find_best_stream(fmtContext, type, -1, -1, nullptr, 0)}
 {
   if(index < 0)
diff --git a/src/ffmpeg/util.h b/src/ffmpeg/util.h
index 2c430b7a3..bbb3013e5 100644
--- a/src/ffmpeg/util.h
+++ b/src/ffmpeg/util.h
@@ -12,14 +12,14 @@ namespace ffmpeg
 template<typename T>
 constexpr T toDuration(int64_t ts, const AVRational& timeBase)
 {
-  using period = typename T::period;
+  using period = T::period;
   return T{ts * (timeBase.num * period::den) / (timeBase.den * period::num)};
 }
 
 template<typename T>
 constexpr int64_t fromDuration(const T& ts, const AVRational& timeBase)
 {
-  using period = typename T::period;
+  using period = T::period;
   return ts.count() * (timeBase.den * period::num) / (timeBase.num * period::den);
 }
 } // namespace ffmpeg
diff --git a/src/gslfailhandler.cpp b/src/gslfailhandler.cpp
index ad34c0c8c..b5ee41db1 100644
--- a/src/gslfailhandler.cpp
+++ b/src/gslfailhandler.cpp
@@ -1,14 +1,14 @@
 #include <boost/log/trivial.hpp>
 #include <boost/throw_exception.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
-[[maybe_unused]] void gsl::fail_fast_assert_handler(char const* const expression,
-                                                    char const* const message,
-                                                    char const* const file,
-                                                    int line)
+[[maybe_unused]] void gsl_lite::fail_fast_assert_handler(char const* const expression,
+                                                         char const* const message,
+                                                         char const* const file,
+                                                         const int line)
 {
   BOOST_LOG_TRIVIAL(fatal) << "Expectation failed at " << file << ":" << line;
   BOOST_LOG_TRIVIAL(fatal) << "  - expression " << expression;
   BOOST_LOG_TRIVIAL(fatal) << "  - message " << message;
-  BOOST_THROW_EXCEPTION(gsl::fail_fast(message));
-}
+  BOOST_THROW_EXCEPTION(gsl_lite::fail_fast(message));
+}
\ No newline at end of file
diff --git a/src/hid/delayedkey.h b/src/hid/delayedkey.h
index 3d8ee1114..c0a14209b 100644
--- a/src/hid/delayedkey.h
+++ b/src/hid/delayedkey.h
@@ -12,7 +12,7 @@ enum class GlfwKey;
 class DelayedKey
 {
 public:
-  explicit DelayedKey(GlfwKey key, int seconds)
+  explicit DelayedKey(const GlfwKey key, const int seconds)
       : m_key{key}
       , m_delay{seconds}
   {
diff --git a/src/hid/inputhandler.cpp b/src/hid/inputhandler.cpp
index 2ba9c28dd..632c5cb87 100644
--- a/src/hid/inputhandler.cpp
+++ b/src/hid/inputhandler.cpp
@@ -20,13 +20,14 @@
 #include <fstream>
 #include <gl/glfw.h>
 #include <gl/window.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <ios>
 #include <iterator>
 #include <memory>
 #include <mutex>
 #include <optional>
+#include <ranges>
 #include <stdexcept>
 #include <string>
 #include <utility>
@@ -53,7 +54,7 @@ std::optional<AxisDir> recentPressedAxis;
 
 constexpr float AxisDeadZone = 0.4f;
 
-void keyCallback(GLFWwindow* /*window*/, int key, int /*scancode*/, int action, int /*mods*/)
+void keyCallback(GLFWwindow* /*window*/, int key, int /*scancode*/, const int action, int /*mods*/)
 {
   if(key < 0)
     return;
@@ -87,7 +88,7 @@ void keyCallback(GLFWwindow* /*window*/, int key, int /*scancode*/, int action,
   }
 }
 
-void joystickCallback(int jid, int event)
+void joystickCallback(int jid, const int event)
 {
   switch(event)
   {
@@ -137,7 +138,7 @@ void uninstallKeyHandler(GLFWwindow* window)
   glfwSetKeyCallback(window, nullptr);
 }
 
-bool isKeyPressed(GlfwKey key)
+bool isKeyPressed(const GlfwKey key)
 {
   const std::lock_guard lock{glfwStateMutex};
   return pressedKeys.count(key) > 0;
@@ -162,7 +163,7 @@ InputHandler::InputHandler(gslu::nn_shared<gl::Window> window, const std::filesy
     if(glfwJoystickPresent(jid) != GLFW_TRUE)
       continue;
 
-    const gsl::czstring name = glfwGetGamepadName(jid);
+    const gsl_lite::czstring name = glfwGetGamepadName(jid);
     if(name == nullptr || glfwJoystickIsGamepad(jid) != GLFW_TRUE)
     {
       BOOST_LOG_TRIVIAL(info) << "Connected joystick #" << jid << " " << glfwGetJoystickName(jid)
@@ -187,8 +188,7 @@ void InputHandler::update()
   const std::lock_guard lock{glfwStateMutex};
   if(!m_window->hasFocus())
   {
-    for(auto& [action, button] : m_inputState.actions)
-      button = false;
+    std::ranges::fill(m_inputState.actions | std::views::values, false);
     m_inputState.setXAxisMovement(false, false);
     m_inputState.setMenuXAxisMovement(false, false);
     m_inputState.setZAxisMovement(false, false);
@@ -199,7 +199,7 @@ void InputHandler::update()
 
   std::vector<GLFWgamepadstate> gamepadStates;
   gamepadStates.reserve(connectedGamepads.size());
-  for(auto jid : connectedGamepads)
+  for(const auto jid : connectedGamepads)
   {
     if(glfwJoystickPresent(jid) != GLFW_TRUE)
       continue;
@@ -210,7 +210,7 @@ void InputHandler::update()
   }
 
   const auto prevPressedButtons = std::exchange(pressedButtons, {});
-  for(const auto& [button, _] : EnumUtil<GlfwGamepadButton>::all())
+  for(const auto& button : EnumUtil<GlfwGamepadButton>::all() | std::views::keys)
   {
     for(const auto& state : gamepadStates)
     {
@@ -225,7 +225,7 @@ void InputHandler::update()
   }
 
   const auto prevPressedAxes = std::exchange(pressedAxes, {});
-  for(const auto& [axis, _] : EnumUtil<GlfwAxis>::all())
+  for(const auto& axis : EnumUtil<GlfwAxis>::all() | std::views::keys)
   {
     for(const auto& state : gamepadStates)
     {
@@ -321,7 +321,7 @@ void InputHandler::setMappings(const std::vector<engine::NamedInputMappingConfig
 }
 
 // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-bool InputHandler::hasKey(GlfwKey key) const
+bool InputHandler::hasKey(const GlfwKey key) const
 {
   return isKeyPressed(key);
 }
diff --git a/src/hid/inputhandler.h b/src/hid/inputhandler.h
index e3b81a5e3..d834d7e5e 100644
--- a/src/hid/inputhandler.h
+++ b/src/hid/inputhandler.h
@@ -34,9 +34,9 @@ class InputHandler final
     return m_inputState;
   }
 
-  [[nodiscard]] bool hasAction(Action action) const
+  [[nodiscard]] bool hasAction(const Action action) const
   {
-    if(auto tmp = m_inputState.actions.find(action); tmp != m_inputState.actions.end())
+    if(const auto tmp = m_inputState.actions.find(action); tmp != m_inputState.actions.end())
       return tmp->second;
 
     return false;
@@ -44,17 +44,16 @@ class InputHandler final
 
   [[nodiscard]] bool hasAnyAction() const
   {
-    return std::any_of(m_inputState.actions.begin(),
-                       m_inputState.actions.end(),
-                       [](const std::pair<Action, InputState::Button>& action)
-                       {
-                         return action.second.current;
-                       });
+    return std::ranges::any_of(m_inputState.actions,
+                               [](const std::pair<Action, InputState::Button>& action)
+                               {
+                                 return action.second.current;
+                               });
   }
 
-  [[nodiscard]] bool hasDebouncedAction(Action action) const
+  [[nodiscard]] bool hasDebouncedAction(const Action action) const
   {
-    if(auto tmp = m_inputState.actions.find(action); tmp != m_inputState.actions.end())
+    if(const auto tmp = m_inputState.actions.find(action); tmp != m_inputState.actions.end())
       return tmp->second.justChangedTo(true);
     return false;
   }
diff --git a/src/hid/inputstate.h b/src/hid/inputstate.h
index f4cce0214..27115d48c 100644
--- a/src/hid/inputstate.h
+++ b/src/hid/inputstate.h
@@ -32,7 +32,7 @@ struct InputState
     {
     }
 
-    DebouncedValue<T>& operator=(const T& state)
+    DebouncedValue& operator=(const T& state)
     {
       previous = std::exchange(current, state);
       return *this;
diff --git a/src/hid/names.cpp b/src/hid/names.cpp
index dfff1f38d..f84292fe2 100644
--- a/src/hid/names.cpp
+++ b/src/hid/names.cpp
@@ -12,7 +12,7 @@
 
 namespace hid
 {
-std::string getName(GlfwKey key)
+std::string getName(const GlfwKey key)
 {
   switch(key)
   {
@@ -260,7 +260,7 @@ std::string getName(GlfwKey key)
   BOOST_THROW_EXCEPTION(std::domain_error("key"));
 }
 
-std::string getName(GlfwGamepadButton button)
+std::string getName(const GlfwGamepadButton button)
 {
   switch(button)
   {
@@ -303,7 +303,7 @@ std::string getName(GlfwGamepadButton button)
   BOOST_THROW_EXCEPTION(std::domain_error("button"));
 }
 
-std::string getName(Action action)
+std::string getName(const Action action)
 {
   switch(action)
   {
diff --git a/src/launcher/croftengine_de_DE.ts b/src/launcher/croftengine_de_DE.ts
index 2cfb99f78..2420a15d8 100644
--- a/src/launcher/croftengine_de_DE.ts
+++ b/src/launcher/croftengine_de_DE.ts
@@ -155,351 +155,351 @@
 <context>
     <name>launcher::MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="244"/>
+        <location filename="mainwindow.cpp" line="243"/>
         <source>Initial Setup</source>
         <translation>Initiales Setup</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="245"/>
+        <location filename="mainwindow.cpp" line="244"/>
         <source>Data Folder Not Found</source>
         <translation>Datenorder nicht gefunden</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="247"/>
+        <location filename="mainwindow.cpp" line="246"/>
         <source>It seems you&apos;re running CroftEngine for the first time. Please select where you want to store your game data.</source>
         <translation>Es scheint, als würden Sie CroftEngine zum ersten mal ausführen. Bitte wählen Sie, wo die Spieldaten gespeichert werden sollen.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="249"/>
+        <location filename="mainwindow.cpp" line="248"/>
         <source>Portable</source>
         <translation>Portabel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="251"/>
+        <location filename="mainwindow.cpp" line="250"/>
         <source>In my Home Directory</source>
         <translation>In meinem Heimordner</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
+        <location filename="mainwindow.cpp" line="271"/>
         <source>Data Folder Created</source>
         <translation>Datenordner erstellt</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
+        <location filename="mainwindow.cpp" line="271"/>
         <source>A game data folder was created in your home directory.</source>
         <translation>Ein Datenordner wurde in Ihrem Heimordner erstellt.</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="350"/>
-        <location filename="mainwindow.cpp" line="461"/>
-        <location filename="mainwindow.cpp" line="578"/>
+        <location filename="mainwindow.cpp" line="460"/>
+        <location filename="mainwindow.cpp" line="577"/>
         <source>Data Imported</source>
         <translation>Daten importiert</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="350"/>
-        <location filename="mainwindow.cpp" line="461"/>
-        <location filename="mainwindow.cpp" line="578"/>
+        <location filename="mainwindow.cpp" line="460"/>
+        <location filename="mainwindow.cpp" line="577"/>
         <source>Game Data has been imported.</source>
         <translation>Spieldaten wurden importiert.</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="357"/>
-        <location filename="mainwindow.cpp" line="469"/>
+        <location filename="mainwindow.cpp" line="468"/>
         <source>Select Archive</source>
         <translation>Archiv wählen</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="357"/>
-        <location filename="mainwindow.cpp" line="469"/>
+        <location filename="mainwindow.cpp" line="468"/>
         <source>ZIP Archive (*.zip)</source>
         <translation>ZIP Archiv (*.zip)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="410"/>
-        <location filename="mainwindow.cpp" line="418"/>
-        <location filename="mainwindow.cpp" line="524"/>
-        <location filename="mainwindow.cpp" line="532"/>
+        <location filename="mainwindow.cpp" line="409"/>
+        <location filename="mainwindow.cpp" line="417"/>
+        <location filename="mainwindow.cpp" line="523"/>
+        <location filename="mainwindow.cpp" line="531"/>
         <source>Could not find game data in archive.</source>
         <translation>Konnte Spieldaten nicht in Archiv finden.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="698"/>
+        <location filename="mainwindow.cpp" line="696"/>
         <source>Image Found</source>
         <translation>Datenträgerabbild gefunden</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="699"/>
+        <location filename="mainwindow.cpp" line="697"/>
         <source>Import from found image?</source>
         <translation>Von gefundenem Datenträgerabbild importieren?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="701"/>
+        <location filename="mainwindow.cpp" line="699"/>
         <source>A game data image has been found at %1. Do you want to use this image or continue manually?</source>
         <translation>Ein Datenträgerabbild der Spieldaten wurde bei %1 gefunden. Möchten Sie dieses Abbild verwenden, oder manuell fortfahren?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="703"/>
+        <location filename="mainwindow.cpp" line="701"/>
         <source>Use Image</source>
         <translation>Abbild benutzen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="719"/>
+        <location filename="mainwindow.cpp" line="717"/>
         <source>TombATI Found</source>
         <translation>TombATI gefunden</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="720"/>
+        <location filename="mainwindow.cpp" line="718"/>
         <source>Import from found TombATI installation?</source>
         <translation>Von TombATI Installation importieren?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="720"/>
         <source>A TombATI installation has been found at %1. Do you want to use this installation or continue manually?</source>
         <translation>Eine TombATI Installation wurde bei %1 gefunden. Möchten Sie diese Installation verwenden oder manuell fortfahren?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="743"/>
+        <location filename="mainwindow.cpp" line="741"/>
         <source>Game Data Files (tomb.exe TOMB.EXE tombati.exe GAME.DAT)</source>
         <translation>Spieldatendateien (tomb.exe TOMB.EXE tombati.exe GAME.DAT)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="818"/>
+        <location filename="mainwindow.cpp" line="816"/>
         <source>Decide to keep already existing ghosts, savegames, etc. in this installation. If you decide to overwrite already existing files, the data will be lost.</source>
         <translation>Entscheiden Sie, ob existierende Geister, Spielstände, etc. beibehalten werden sollen. Wenn Sie sich für ein Überschreiben entscheiden, gehen die Daten verloren.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="924"/>
+        <location filename="mainwindow.cpp" line="922"/>
         <source>Please select what type of texture pack you want to activate. If your texture pack contains a equiv.txt file, use the first option. If your texture pack contains a series of folders which are made of 32 numbers and letters, use the second one.</source>
         <translation>Bitte wählen Sie, welchen Typ von Textur Paket Sie aktivieren möchten. Wenn das Textur Paket eine equiv.txt Datei enthält, wählen Sie die erste Option. Wenn Ihr Textur Paket eine Reihe von Ordnern enthält, bestehend aus 32 Zahlen und Buchstaben, wählen Sie die zweite Option.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1103"/>
-        <location filename="mainwindow.cpp" line="1111"/>
-        <location filename="mainwindow.cpp" line="1119"/>
-        <location filename="mainwindow.cpp" line="1127"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1118"/>
+        <location filename="mainwindow.cpp" line="1126"/>
         <source>Invalid Connection Settings</source>
         <translation>Ungültige Verbindungseinstellungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1104"/>
+        <location filename="mainwindow.cpp" line="1103"/>
         <source>Ensure you enter your server address only containing the domain name and the port, for example like &apos;example.com:12345&apos;.</source>
         <translation>Stellen Sie sicher, dass die Server-Adresse nur die Domain und den Port enthält, zum Beispiel &apos;example.com:12345&apos;.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1111"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Please fill in your username.</source>
         <translation>Bitte füllen Sie Ihren Benutzernamen aus.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1119"/>
         <source>Invalid auth token, make sure you copied it from the website. This is NOT your password.</source>
         <translation>Ungültiges Auth Token, stellen Sie sicher, dass sie dieses von der Webseite kopiert haben. Dies ist NICHT Ihr Passwort.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1127"/>
+        <location filename="mainwindow.cpp" line="1126"/>
         <source>Invalid session ID, make sure you copied it from the website.</source>
         <translation>Ungültige Session ID, stellen Sie sicher, dass Sie diese von der Webseite kopiert haben.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1131"/>
         <source>Valid Connection Settings</source>
         <translation>Gültige Verbindungseinstellungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1133"/>
+        <location filename="mainwindow.cpp" line="1132"/>
         <source>Your configuration seems valid. However, no attempt was made to check against the server that it will actually work.</source>
         <translation>Ihre Verbindungseinstellungen scheinen gültig zu sein. Dennoch wurde kein Versuch unternommen, ob diese wirklich funktionieren.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1220"/>
+        <location filename="mainwindow.cpp" line="1218"/>
         <source>New version available: &lt;a href=&quot;https://github.com/stohrendorf/CroftEngine/releases/tag/%1&quot;&gt;%1&lt;/a&gt; (you are running version &lt;a href=&quot;https://github.com/stohrendorf/CroftEngine/releases/tag/v%2&quot;&gt;v%2&lt;/a&gt;)</source>
         <translation>Neue Version verfügbar: &lt;a href=&quot;https://github.com/stohrendorf/CroftEngine/releases/tag/%1&quot;&gt;%1&lt;/a&gt; (aktuell wird Version &lt;a href=&quot;https://github.com/stohrendorf/CroftEngine/releases/tag/v%2&quot;&gt;v%2&lt;/a&gt; ausgeführt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="724"/>
+        <location filename="mainwindow.cpp" line="722"/>
         <source>Use TombATI installation</source>
         <translation>TombATI Installation benutzen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="704"/>
-        <location filename="mainwindow.cpp" line="725"/>
+        <location filename="mainwindow.cpp" line="702"/>
+        <location filename="mainwindow.cpp" line="723"/>
         <source>Continue Manually</source>
         <translation>Manuell fortfahren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="743"/>
+        <location filename="mainwindow.cpp" line="741"/>
         <source>Select Tomb Raider 1 Data</source>
         <translation>Tomb Raider 1 Daten wählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="790"/>
-        <location filename="mainwindow.cpp" line="798"/>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="854"/>
         <source>Copy Failed</source>
         <translation>Kopieren fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="790"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Failed to delete %1</source>
         <translation>Konnte %1 nicht löschen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="798"/>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="854"/>
         <source>Failed to copy %1 to %2</source>
         <translation>Konnte %1 nicht nach %2 kopieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="808"/>
+        <location filename="mainwindow.cpp" line="806"/>
         <source>Select Other CroftEngine/EdisonEngine Installation</source>
         <translation>Andere CroftEngine/EdisonEngine Installation wählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="810"/>
+        <location filename="mainwindow.cpp" line="808"/>
         <source>CroftEngine/EdisonEngine files (croftengine.exe edisonengine.exe config.yaml)</source>
         <translation>CroftEngine/EdisonEngine Dateien (croftengine.exe edisonengine.exe config.yaml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="815"/>
+        <location filename="mainwindow.cpp" line="813"/>
         <source>Data Migration</source>
         <translation>Datenmigration</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="816"/>
+        <location filename="mainwindow.cpp" line="814"/>
         <source>Overwrite Existing Data?</source>
         <translation>Existierende Daten überschreiben?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="820"/>
+        <location filename="mainwindow.cpp" line="818"/>
         <source>Overwrite</source>
         <translation>Überschreiben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Don&apos;t overwrite</source>
         <translation>Nicht überschreiben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="859"/>
         <source>Data Migrated</source>
         <translation>Daten migriert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="859"/>
         <source>Your old data has been migrated.</source>
         <translation>Ihre alten Daten wurden migriert.</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="370"/>
-        <location filename="mainwindow.cpp" line="410"/>
-        <location filename="mainwindow.cpp" line="418"/>
-        <location filename="mainwindow.cpp" line="427"/>
-        <location filename="mainwindow.cpp" line="482"/>
-        <location filename="mainwindow.cpp" line="524"/>
-        <location filename="mainwindow.cpp" line="532"/>
-        <location filename="mainwindow.cpp" line="541"/>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="409"/>
+        <location filename="mainwindow.cpp" line="417"/>
+        <location filename="mainwindow.cpp" line="426"/>
+        <location filename="mainwindow.cpp" line="481"/>
+        <location filename="mainwindow.cpp" line="523"/>
+        <location filename="mainwindow.cpp" line="531"/>
+        <location filename="mainwindow.cpp" line="540"/>
+        <location filename="mainwindow.cpp" line="878"/>
         <source>Extraction Error</source>
         <translation>Extraktionsfehler</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="371"/>
-        <location filename="mainwindow.cpp" line="428"/>
-        <location filename="mainwindow.cpp" line="483"/>
-        <location filename="mainwindow.cpp" line="542"/>
-        <location filename="mainwindow.cpp" line="881"/>
+        <location filename="mainwindow.cpp" line="427"/>
+        <location filename="mainwindow.cpp" line="482"/>
+        <location filename="mainwindow.cpp" line="541"/>
+        <location filename="mainwindow.cpp" line="879"/>
         <source>Could not open %1 as an archive: %2</source>
         <translation>Konnte %1 nicht als Archiv öffnen: %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="895"/>
+        <location filename="mainwindow.cpp" line="893"/>
         <source>Soundtrack Downloaded</source>
         <translation>Soundtrack heruntergeladen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="895"/>
+        <location filename="mainwindow.cpp" line="893"/>
         <source>The Soundtrack has been downloaded successfully.</source>
         <translation>Der Soundtrack wurde erfolgreich heruntergeladen.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="904"/>
+        <location filename="mainwindow.cpp" line="902"/>
         <source>Clear Config</source>
         <translation>Konfiguration zurücksetzen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="905"/>
+        <location filename="mainwindow.cpp" line="903"/>
         <source>The configuration is cleared. If you still have problems, make sure you have imported the game data and that you&apos;re not running on an Intel GPU.</source>
         <translation>Die Konfiguration wurde zurückgesetzt. Falls Sie immernoch Probleme haben, stellen Sie sicher, dass Sie die Spieldaten importiert haben und dass Sie keine Intel GPU benutzen.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="913"/>
         <source>Not Configured</source>
         <translation>Nicht konfiguriert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="913"/>
         <source>To be able to configure a texture pack, you need to start the engine once.</source>
         <translation>Um ein Textur Paket konfigurieren zu können, müssen Sie die Engine einmal starten.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="921"/>
+        <location filename="mainwindow.cpp" line="919"/>
         <source>Texture Pack Type</source>
         <translation>Textur Paket Typ</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="922"/>
+        <location filename="mainwindow.cpp" line="920"/>
         <source>Please select Texture Pack Type</source>
         <translation>Bitte wählen Sie den Typ des Textur Pakets</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="928"/>
+        <location filename="mainwindow.cpp" line="927"/>
         <source>Folders</source>
         <translation>Ordner</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="935"/>
+        <location filename="mainwindow.cpp" line="934"/>
         <source>Texture Pack Main File</source>
         <translation>Textur Paket Hauptdatei</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="936"/>
+        <location filename="mainwindow.cpp" line="935"/>
         <source>In the following dialog, select a file from the top-most directory of the texture pack.</source>
         <translation>Wählen Sie im folgenden Dialog eine Datei aus dem obersten Ordner des Textur Pakets.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="938"/>
-        <location filename="mainwindow.cpp" line="947"/>
+        <location filename="mainwindow.cpp" line="937"/>
+        <location filename="mainwindow.cpp" line="946"/>
         <source>Select Glidos Texture Pack Main File</source>
         <translation>Glidos Textur Paket Hauptdatei wählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="938"/>
+        <location filename="mainwindow.cpp" line="937"/>
         <source>Texture Pack Main File (equiv.txt)</source>
         <translation>Textur Paket Hauptdatei (equiv.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="985"/>
         <source>Invalid Config</source>
         <translation>Ungültige Konfiguration</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="985"/>
         <source>Your configuration file is invalid. Reset your configuration.</source>
         <translation>Ihre Konfigurationsdatei ist ungültig. Setzen Sie Ihre Konfiguration zurück.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1063"/>
+        <location filename="mainwindow.cpp" line="1062"/>
         <source>Import Data</source>
         <translation>Daten importieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1067"/>
+        <location filename="mainwindow.cpp" line="1066"/>
         <source>By %1</source>
         <translation>Von %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1087"/>
+        <location filename="mainwindow.cpp" line="1086"/>
         <source>Choose Your Ghost Color</source>
         <translation>Geistfarbe wählen</translation>
     </message>
diff --git a/src/launcher/croftengine_fr_FR.ts b/src/launcher/croftengine_fr_FR.ts
index b41be60b3..42d61a65d 100644
--- a/src/launcher/croftengine_fr_FR.ts
+++ b/src/launcher/croftengine_fr_FR.ts
@@ -158,351 +158,351 @@
 <context>
     <name>launcher::MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="244"/>
+        <location filename="mainwindow.cpp" line="243"/>
         <source>Initial Setup</source>
         <translation>Réglages initiaux</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="245"/>
+        <location filename="mainwindow.cpp" line="244"/>
         <source>Data Folder Not Found</source>
         <translation>Dossier de données non trouvé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="247"/>
+        <location filename="mainwindow.cpp" line="246"/>
         <source>It seems you&apos;re running CroftEngine for the first time. Please select where you want to store your game data.</source>
         <translation>Il semble que vous lanciez CroftEngine pour la première fois. Veuillez choisir où enregistrer les données de jeu.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="249"/>
+        <location filename="mainwindow.cpp" line="248"/>
         <source>Portable</source>
         <translation>Portable</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="251"/>
+        <location filename="mainwindow.cpp" line="250"/>
         <source>In my Home Directory</source>
         <translation>Dans mon dossier personnel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
+        <location filename="mainwindow.cpp" line="271"/>
         <source>Data Folder Created</source>
         <translation>Dossier de données créé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
+        <location filename="mainwindow.cpp" line="271"/>
         <source>A game data folder was created in your home directory.</source>
         <translation>Un dossier de donées a été créé dans votre dossier personnel.</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="350"/>
-        <location filename="mainwindow.cpp" line="461"/>
-        <location filename="mainwindow.cpp" line="578"/>
+        <location filename="mainwindow.cpp" line="460"/>
+        <location filename="mainwindow.cpp" line="577"/>
         <source>Data Imported</source>
         <translation>Données importées</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="350"/>
-        <location filename="mainwindow.cpp" line="461"/>
-        <location filename="mainwindow.cpp" line="578"/>
+        <location filename="mainwindow.cpp" line="460"/>
+        <location filename="mainwindow.cpp" line="577"/>
         <source>Game Data has been imported.</source>
         <translation>Les données de jeu ont été importées.</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="357"/>
-        <location filename="mainwindow.cpp" line="469"/>
+        <location filename="mainwindow.cpp" line="468"/>
         <source>Select Archive</source>
         <translation>Sélectionner l&apos;archive</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="357"/>
-        <location filename="mainwindow.cpp" line="469"/>
+        <location filename="mainwindow.cpp" line="468"/>
         <source>ZIP Archive (*.zip)</source>
         <translation>Archive ZIP (*.zip)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="410"/>
-        <location filename="mainwindow.cpp" line="418"/>
-        <location filename="mainwindow.cpp" line="524"/>
-        <location filename="mainwindow.cpp" line="532"/>
+        <location filename="mainwindow.cpp" line="409"/>
+        <location filename="mainwindow.cpp" line="417"/>
+        <location filename="mainwindow.cpp" line="523"/>
+        <location filename="mainwindow.cpp" line="531"/>
         <source>Could not find game data in archive.</source>
         <translation>Impossible de trouver les données de jeu dans l&apos;archive.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="698"/>
+        <location filename="mainwindow.cpp" line="696"/>
         <source>Image Found</source>
         <translation>Image trouvée</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="699"/>
+        <location filename="mainwindow.cpp" line="697"/>
         <source>Import from found image?</source>
         <translation>Importer depuis l&apos;image trouvée ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="701"/>
+        <location filename="mainwindow.cpp" line="699"/>
         <source>A game data image has been found at %1. Do you want to use this image or continue manually?</source>
         <translation>Une image de données de jeu a été trouvée à %1. Voulez-vous utiliser cette image ou continuer manuellement ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="703"/>
+        <location filename="mainwindow.cpp" line="701"/>
         <source>Use Image</source>
         <translation>Utiliser l&apos;image</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="719"/>
+        <location filename="mainwindow.cpp" line="717"/>
         <source>TombATI Found</source>
         <translation>TombATI trouvé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="720"/>
+        <location filename="mainwindow.cpp" line="718"/>
         <source>Import from found TombATI installation?</source>
         <translation>Importer depuis l&apos;installation de TombATI trouvée ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="720"/>
         <source>A TombATI installation has been found at %1. Do you want to use this installation or continue manually?</source>
         <translation>Une installation de TombATI a été trouvée à %1. Voulez-vous utiliser cette installation ou continuer manuellement ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="743"/>
+        <location filename="mainwindow.cpp" line="741"/>
         <source>Game Data Files (tomb.exe TOMB.EXE tombati.exe GAME.DAT)</source>
         <translation>Fichiers de données de jeu (tomb.exe TOMB.EXE tombati.exe GAME.DAT)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="818"/>
+        <location filename="mainwindow.cpp" line="816"/>
         <source>Decide to keep already existing ghosts, savegames, etc. in this installation. If you decide to overwrite already existing files, the data will be lost.</source>
         <translation>Choisir de garder les fantômes, sauvegardes, etc, déjà existants dans cette installation. Si vous décidez d&apos;écraser les fichiers existants, les données seront perdues.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="924"/>
+        <location filename="mainwindow.cpp" line="922"/>
         <source>Please select what type of texture pack you want to activate. If your texture pack contains a equiv.txt file, use the first option. If your texture pack contains a series of folders which are made of 32 numbers and letters, use the second one.</source>
         <translation>Veuillez sélectionner le type de pack de textures que vous voulez activer. Si votre pack de textures contient un fichier equiv.txt, prenez la premiére option. Si votre pack de textures contient une série de dossiers faits de 32 nombres et lettres, prenez la seconde.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1103"/>
-        <location filename="mainwindow.cpp" line="1111"/>
-        <location filename="mainwindow.cpp" line="1119"/>
-        <location filename="mainwindow.cpp" line="1127"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1118"/>
+        <location filename="mainwindow.cpp" line="1126"/>
         <source>Invalid Connection Settings</source>
         <translation>Configuration de connexion invalide</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1104"/>
+        <location filename="mainwindow.cpp" line="1103"/>
         <source>Ensure you enter your server address only containing the domain name and the port, for example like &apos;example.com:12345&apos;.</source>
         <translation>Assurez-vous d&apos;entrer une adresse de serveur contenant uniquement le nom de domaine et le port, par exemple &apos;exemple.com:12345&apos;.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1111"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Please fill in your username.</source>
         <translation>Veuillez renseigner votre nom d&apos;utilisateur.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1120"/>
+        <location filename="mainwindow.cpp" line="1119"/>
         <source>Invalid auth token, make sure you copied it from the website. This is NOT your password.</source>
         <translation>Jeton d&apos;authentification invalide, assurez-vous de l&apos;avoir copié depuis le site web. Ce n&apos;est PAS votre mot de passe.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1127"/>
+        <location filename="mainwindow.cpp" line="1126"/>
         <source>Invalid session ID, make sure you copied it from the website.</source>
         <translation>Identifiant de session invalide, assurez-vous de l&apos;avoir copié depuis le site web.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1132"/>
+        <location filename="mainwindow.cpp" line="1131"/>
         <source>Valid Connection Settings</source>
         <translation>Configuration de connexion valide</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1133"/>
+        <location filename="mainwindow.cpp" line="1132"/>
         <source>Your configuration seems valid. However, no attempt was made to check against the server that it will actually work.</source>
         <translation>Votre configuration semble valide. Cependant, aucune tenative n&apos;a été faite pour vérifier avec le serveur si cela va fonctionner.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1220"/>
+        <location filename="mainwindow.cpp" line="1218"/>
         <source>New version available: &lt;a href=&quot;https://github.com/stohrendorf/CroftEngine/releases/tag/%1&quot;&gt;%1&lt;/a&gt; (you are running version &lt;a href=&quot;https://github.com/stohrendorf/CroftEngine/releases/tag/v%2&quot;&gt;v%2&lt;/a&gt;)</source>
         <translation>Nouvelle version disponible : &lt;a href=&quot;https://github.com/stohrendorf/CroftEngine/releases/tag/%1&quot;&gt;%1&lt;/a&gt; (vous utilisez la version &lt;a href=&quot;https://github.com/stohrendorf/CroftEngine/releases/tag/v%2&quot;&gt;v%2&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="724"/>
+        <location filename="mainwindow.cpp" line="722"/>
         <source>Use TombATI installation</source>
         <translation>Utiliser l&apos;installation de TombATI</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="704"/>
-        <location filename="mainwindow.cpp" line="725"/>
+        <location filename="mainwindow.cpp" line="702"/>
+        <location filename="mainwindow.cpp" line="723"/>
         <source>Continue Manually</source>
         <translation>Continuer manuellement</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="743"/>
+        <location filename="mainwindow.cpp" line="741"/>
         <source>Select Tomb Raider 1 Data</source>
         <translation>Sélectionner les données de Tomb Raider 1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="790"/>
-        <location filename="mainwindow.cpp" line="798"/>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="854"/>
         <source>Copy Failed</source>
         <translation>Échec de copie</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="790"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Failed to delete %1</source>
         <translation>Échec de suppression de %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="798"/>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="854"/>
         <source>Failed to copy %1 to %2</source>
         <translation>Échec de copie de %1 vers %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="808"/>
+        <location filename="mainwindow.cpp" line="806"/>
         <source>Select Other CroftEngine/EdisonEngine Installation</source>
         <translation>Sélectionner une autre installation de CroftEngine/EdisonEngine</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="810"/>
+        <location filename="mainwindow.cpp" line="808"/>
         <source>CroftEngine/EdisonEngine files (croftengine.exe edisonengine.exe config.yaml)</source>
         <translation>Fichiers de CroftEngine/EdisonEngine (croftengine.exe edisonengine.exe config.yaml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="815"/>
+        <location filename="mainwindow.cpp" line="813"/>
         <source>Data Migration</source>
         <translation>Migration de données</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="816"/>
+        <location filename="mainwindow.cpp" line="814"/>
         <source>Overwrite Existing Data?</source>
         <translation>Écraser les données existantes ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="820"/>
+        <location filename="mainwindow.cpp" line="818"/>
         <source>Overwrite</source>
         <translation>Écraser</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="819"/>
         <source>Don&apos;t overwrite</source>
         <translation>Ne pas écraser</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="859"/>
         <source>Data Migrated</source>
         <translation>Données migrées</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="859"/>
         <source>Your old data has been migrated.</source>
         <translation>Vos anciennes données ont été migrées.</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="370"/>
-        <location filename="mainwindow.cpp" line="410"/>
-        <location filename="mainwindow.cpp" line="418"/>
-        <location filename="mainwindow.cpp" line="427"/>
-        <location filename="mainwindow.cpp" line="482"/>
-        <location filename="mainwindow.cpp" line="524"/>
-        <location filename="mainwindow.cpp" line="532"/>
-        <location filename="mainwindow.cpp" line="541"/>
-        <location filename="mainwindow.cpp" line="880"/>
+        <location filename="mainwindow.cpp" line="409"/>
+        <location filename="mainwindow.cpp" line="417"/>
+        <location filename="mainwindow.cpp" line="426"/>
+        <location filename="mainwindow.cpp" line="481"/>
+        <location filename="mainwindow.cpp" line="523"/>
+        <location filename="mainwindow.cpp" line="531"/>
+        <location filename="mainwindow.cpp" line="540"/>
+        <location filename="mainwindow.cpp" line="878"/>
         <source>Extraction Error</source>
         <translation>Erreur d&apos;extraction</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="371"/>
-        <location filename="mainwindow.cpp" line="428"/>
-        <location filename="mainwindow.cpp" line="483"/>
-        <location filename="mainwindow.cpp" line="542"/>
-        <location filename="mainwindow.cpp" line="881"/>
+        <location filename="mainwindow.cpp" line="427"/>
+        <location filename="mainwindow.cpp" line="482"/>
+        <location filename="mainwindow.cpp" line="541"/>
+        <location filename="mainwindow.cpp" line="879"/>
         <source>Could not open %1 as an archive: %2</source>
         <translation>Impossible d&apos;ouvrir %1 comme une archive : %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="895"/>
+        <location filename="mainwindow.cpp" line="893"/>
         <source>Soundtrack Downloaded</source>
         <translation>Bande son téléchargée</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="895"/>
+        <location filename="mainwindow.cpp" line="893"/>
         <source>The Soundtrack has been downloaded successfully.</source>
         <translation>La bande son a été téléchargée avec succès.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="904"/>
+        <location filename="mainwindow.cpp" line="902"/>
         <source>Clear Config</source>
         <translation>Effacer la configuration</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="905"/>
+        <location filename="mainwindow.cpp" line="903"/>
         <source>The configuration is cleared. If you still have problems, make sure you have imported the game data and that you&apos;re not running on an Intel GPU.</source>
         <translation>La configuration est effacée. Si vous avez encore des problèmes, assurez-vous d&apos;avoir importé les données de jeu et que vous n&apos;utilisez pas un GPU Intel.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="913"/>
         <source>Not Configured</source>
         <translation>Non configuré</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="913"/>
         <source>To be able to configure a texture pack, you need to start the engine once.</source>
         <translation>Pour pouvoir utiliser un pack de textures, vous devez lancer le moteur une fois.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="921"/>
+        <location filename="mainwindow.cpp" line="919"/>
         <source>Texture Pack Type</source>
         <translation>Type de pack de textures</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="922"/>
+        <location filename="mainwindow.cpp" line="920"/>
         <source>Please select Texture Pack Type</source>
         <translation>Veuillez sélectionner le type de pack de textures</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="928"/>
+        <location filename="mainwindow.cpp" line="927"/>
         <source>Folders</source>
         <translation>Dossiers</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="935"/>
+        <location filename="mainwindow.cpp" line="934"/>
         <source>Texture Pack Main File</source>
         <translation>Fichier principal du pack de textures</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="936"/>
+        <location filename="mainwindow.cpp" line="935"/>
         <source>In the following dialog, select a file from the top-most directory of the texture pack.</source>
         <translation>Dans le dialogue suivant, sélectionnez un fichier du dossier le plus élevé du pack de textures.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="938"/>
-        <location filename="mainwindow.cpp" line="947"/>
+        <location filename="mainwindow.cpp" line="937"/>
+        <location filename="mainwindow.cpp" line="946"/>
         <source>Select Glidos Texture Pack Main File</source>
         <translation>Sélectionner le fichier principal du pack de textures Glidos</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="938"/>
+        <location filename="mainwindow.cpp" line="937"/>
         <source>Texture Pack Main File (equiv.txt)</source>
         <translation>Fichier principal du pack de textures (equiv.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="985"/>
         <source>Invalid Config</source>
         <translation>Configuration invalide</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="985"/>
         <source>Your configuration file is invalid. Reset your configuration.</source>
         <translation>Votre fichier de configuration est invalide. Réinitialisez votre configuration.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1063"/>
+        <location filename="mainwindow.cpp" line="1062"/>
         <source>Import Data</source>
         <translation>Importer les données</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1067"/>
+        <location filename="mainwindow.cpp" line="1066"/>
         <source>By %1</source>
         <translation>Par %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1087"/>
+        <location filename="mainwindow.cpp" line="1086"/>
         <source>Choose Your Ghost Color</source>
         <translation>Choisissez la couleur de votre fantôme</translation>
     </message>
diff --git a/src/launcher/downloadprogress.cpp b/src/launcher/downloadprogress.cpp
index 8852eb4c1..a7f15b6ad 100644
--- a/src/launcher/downloadprogress.cpp
+++ b/src/launcher/downloadprogress.cpp
@@ -5,7 +5,7 @@
 #include <boost/log/trivial.hpp>
 #include <filesystem>
 #include <fstream>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 #include <QMessageBox>
 #include <utility>
@@ -41,10 +41,10 @@ DownloadProgress::~DownloadProgress()
 }
 
 // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-void DownloadProgress::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
+void DownloadProgress::downloadProgress(const qint64 bytesReceived, const qint64 bytesTotal)
 {
-  ui->progressBar->setMaximum(gsl::narrow<int>(bytesTotal));
-  ui->progressBar->setValue(gsl::narrow<int>(bytesReceived));
+  ui->progressBar->setMaximum(gsl_lite::narrow<int>(bytesTotal));
+  ui->progressBar->setValue(gsl_lite::narrow<int>(bytesReceived));
 }
 
 void DownloadProgress::finished()
@@ -96,4 +96,4 @@ void DownloadProgress::errorOccurred(QNetworkReply::NetworkError /*error*/)
   QMessageBox::critical(
     this, tr("Download Failed"), tr("The download failed with an error: %1").arg(m_reply->errorString()));
 }
-} // namespace launcher
+} // namespace launcher
\ No newline at end of file
diff --git a/src/launcher/downloadprogress.h b/src/launcher/downloadprogress.h
index d0f2bed4d..ce1051992 100644
--- a/src/launcher/downloadprogress.h
+++ b/src/launcher/downloadprogress.h
@@ -15,7 +15,7 @@ class DownloadProgress;
 
 namespace launcher
 {
-class DownloadProgress : public QWidget
+class DownloadProgress final : public QWidget
 {
   Q_OBJECT
 
diff --git a/src/launcher/launcher.cpp b/src/launcher/launcher.cpp
index 2e5c5917e..cbe6c540e 100644
--- a/src/launcher/launcher.cpp
+++ b/src/launcher/launcher.cpp
@@ -4,7 +4,7 @@
 #include "paths.h"
 
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <optional>
 #include <QApplication>
 #include <QDebug>
@@ -46,4 +46,4 @@ std::optional<std::tuple<std::string, std::string, bool>> showLauncher(int argc,
   QApplication::exec();
   return w.getLaunchRequest();
 }
-} // namespace launcher
+} // namespace launcher
\ No newline at end of file
diff --git a/src/launcher/mainwindow.cpp b/src/launcher/mainwindow.cpp
index 08e685d84..a376d671e 100644
--- a/src/launcher/mainwindow.cpp
+++ b/src/launcher/mainwindow.cpp
@@ -1,3 +1,4 @@
+#include <ranges>
 #ifdef __clang__
 #  pragma clang diagnostic push
 #  pragma ide diagnostic ignored "misc-include-cleaner"
@@ -27,7 +28,7 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/log/trivial.hpp>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <QColorDialog>
 #include <QDesktopServices>
@@ -55,23 +56,22 @@ namespace launcher
 {
 namespace
 {
-const char* const LanguageConfigKey = "launcher-language";
-const char* const GameflowConfigKey = "launcher-gameflow";
+const auto LanguageConfigKey = "launcher-language";
+const auto GameflowConfigKey = "launcher-gameflow";
 #ifdef CE_GITHUB_API_KEY
-const char* const LastUpdateCheck = "launcher-updatecheck";
+const auto LastUpdateCheck = "launcher-updatecheck";
 #endif
-const char* const LastCheckedVersion = "launcher-updateversion";
-const int IdRole = Qt::UserRole + 1;
-const int AuthorRole = Qt::UserRole + 2;
-const int UrlsRole = Qt::UserRole + 3;
-const int DownloadSoundtrackRole = Qt::UserRole + 4;
+const auto LastCheckedVersion = "launcher-updateversion";
+constexpr int IdRole = Qt::UserRole + 1;
+constexpr int AuthorRole = Qt::UserRole + 2;
+constexpr int UrlsRole = Qt::UserRole + 3;
+constexpr int DownloadSoundtrackRole = Qt::UserRole + 4;
 
-const std::vector<gsl::czstring> DirsToCopy{"FMV", "DATA", "Music", "pictures"};
+const std::vector DirsToCopy{"FMV", "DATA", "Music", "pictures"};
 
 void extractImage(const std::filesystem::path& cueFile, const std::filesystem::path& targetDir)
 {
-  auto img = std::make_unique<image::DiscImage>(cueFile);
-  for(const auto& [path, span] : image::getFiles(*img))
+  for(const auto img = std::make_unique<image::DiscImage>(cueFile); const auto& [path, span] : image::getFiles(*img))
   {
     gsl_Assert(!path.empty());
     const auto root = *path.begin();
@@ -85,7 +85,7 @@ void extractImage(const std::filesystem::path& cueFile, const std::filesystem::p
     std::filesystem::create_directories(targetDir / path.parent_path());
     const auto data = image::readFile(*img, span);
     std::ofstream tmp{targetDir / path, std::ios::binary | std::ios::trunc};
-    tmp.write(reinterpret_cast<const char*>(data.data()), gsl::narrow<std::streamsize>(data.size()));
+    tmp.write(reinterpret_cast<const char*>(data.data()), gsl_lite::narrow<std::streamsize>(data.size()));
   }
 }
 
@@ -100,7 +100,7 @@ std::optional<std::filesystem::path> readRegistryPath(const std::wstring& path,
   }
 
   std::array<WCHAR, 512> szBuffer{};
-  auto dwBufferSize = gsl::narrow<DWORD>(szBuffer.size());
+  auto dwBufferSize = gsl_lite::narrow<DWORD>(szBuffer.size());
   DWORD type = REG_NONE;
   const auto nError
     = RegQueryValueExW(subKey, key.c_str(), nullptr, &type, reinterpret_cast<PBYTE>(szBuffer.data()), &dwBufferSize);
@@ -131,7 +131,7 @@ MainWindow::MainWindow(QWidget* parent)
     const auto language = settings.value(LanguageConfigKey, QVariant{QString{"en_GB"}}).toString();
 
     ui->languages->setModel(&m_languages);
-    m_languages.insertRows(0, gsl::narrow<int>(getSupportedLanguages().size()));
+    m_languages.insertRows(0, gsl_lite::narrow<int>(getSupportedLanguages().size()));
     int i = 0;
     for(const auto& [languageId, languageName] : getSupportedLanguages())
     {
@@ -165,11 +165,11 @@ MainWindow::MainWindow(QWidget* parent)
 
       serialization::YAMLDocument<true> doc{it->path() / "meta.yml"};
       gameflow::Meta meta{};
-      doc.deserialize("meta", gsl::not_null{&meta}, meta);
+      doc.deserialize("meta", gsl_lite::not_null{&meta}, meta);
       metas.emplace_back(it->path().stem().string(), meta);
     }
 
-    m_gameflows.insertRows(0, gsl::narrow<int>(metas.size()));
+    m_gameflows.insertRows(0, gsl_lite::narrow<int>(metas.size()));
     int i = 0;
     for(const auto& [gameflowId, gameflowMeta] : metas)
     {
@@ -193,8 +193,7 @@ MainWindow::MainWindow(QWidget* parent)
 
     for(i = 0; i < m_gameflows.rowCount(); ++i)
     {
-      const auto index = m_gameflows.index(i, 0);
-      if(gameflow == m_gameflows.data(index, IdRole).toString())
+      if(const auto index = m_gameflows.index(i, 0); gameflow == m_gameflows.data(index, IdRole).toString())
       {
         ui->gameflows->setCurrentIndex(index);
         onGameflowSelected(index);
@@ -317,6 +316,7 @@ MainWindow::~MainWindow()
 }
 
 // NOLINTNEXTLINE(*-convert-member-functions-to-static)
+// ReSharper disable once CppMemberFunctionMayBeStatic
 void MainWindow::onOpenDataLocationClicked()
 {
   // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
@@ -331,10 +331,10 @@ void MainWindow::onImportClicked()
   {
     const auto downloadSoundtrack = ui->gameflows->currentIndex().data(DownloadSoundtrackRole).toBool();
     // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-    const auto userDataDir = findUserDataDir().value();
-    if(downloadSoundtrack && !std::filesystem::is_regular_file(userDataDir / "data" / gameflowId / "AUDIO" / "002.ogg"))
+    if(const auto userDataDir = findUserDataDir().value();
+       downloadSoundtrack && !std::filesystem::is_regular_file(userDataDir / "data" / gameflowId / "AUDIO" / "002.ogg"))
     {
-      auto downloader = new DownloadProgress(
+      const auto downloader = new DownloadProgress(
         QUrl{"https://opentomb.earvillage.net/croftengine-audio-tr1.zip"}, userDataDir / "data" / "tracks.zip", this);
       connect(downloader, &DownloadProgress::downloaded, this, &MainWindow::extractSoundtrackZip);
       downloader->show();
@@ -394,15 +394,14 @@ void MainWindow::onImportClicked()
       std::map<std::filesystem::path, std::vector<std::filesystem::path>> candidates;
       for(const auto& dir : archiveDirs)
       {
-        const auto stem = QString::fromUtf8(dir.stem().string().c_str()).toLower();
-        if(stem != "data")
+        if(const auto stem = QString::fromUtf8(dir.stem().string().c_str()).toLower(); stem != "data")
           continue;
 
         BOOST_LOG_TRIVIAL(debug) << "candidate path " << dir;
         candidates[dir.parent_path()].emplace_back(dir);
       }
       bool foundSuspect = false;
-      for(const auto& [base, full] : candidates)
+      for(const auto& base : candidates | std::views::keys)
       {
         BOOST_LOG_TRIVIAL(debug) << "suspect path " << base;
         if(foundSuspect)
@@ -614,12 +613,11 @@ std::optional<std::filesystem::path> tryGetSteamGamePath(const std::filesystem::
     std::vector<std::filesystem::path> paths;
     for(const auto& [entryId, entryContent] : root.childs)
     {
-      if(std::any_of(entryId.begin(),
-                     entryId.end(),
-                     [](auto c)
-                     {
-                       return c < '0' || c > '9';
-                     }))
+      if(std::ranges::any_of(entryId,
+                             [](auto c)
+                             {
+                               return c < '0' || c > '9';
+                             }))
       {
         BOOST_LOG_TRIVIAL(debug) << "Invalid library folder entry key";
         continue;
@@ -765,13 +763,13 @@ bool MainWindow::importBaseGameData()
 void MainWindow::copyDir(const QString& srcPath,
                          const std::filesystem::path& targetDir,
                          const std::string& subDirName,
-                         bool overwriteExisting)
+                         const bool overwriteExisting)
 {
   // TODO subDirName is case-sensitive here, must be changed to be not case-sensitive
   std::filesystem::create_directories(targetDir / subDirName);
 
-  const auto srcSubPath = srcPath + QDir::separator() + subDirName.c_str();
-  for(const auto& fileName : QDir{srcSubPath}.entryList(QDir::Files))
+  for(const auto srcSubPath = srcPath + QDir::separator() + subDirName.c_str();
+      const auto& fileName : QDir{srcSubPath}.entryList(QDir::Files))
   {
     const auto srcFilename = srcSubPath + QDir::separator() + fileName;
     const auto dstFilename = QString((targetDir / subDirName).string().c_str()) + QDir::separator() + fileName;
@@ -819,7 +817,8 @@ void MainWindow::onMigrateClicked()
        "already existing files, the data will be lost."));
   const auto overwriteBtn = askDataOverwrite.addButton(tr("Overwrite"), QMessageBox::ButtonRole::YesRole);
   const auto keepBtn = askDataOverwrite.addButton(tr("Don't overwrite"), QMessageBox::ButtonRole::NoRole);
-  /*const auto abortBtn = */ askDataOverwrite.addButton("Abort", QMessageBox::ButtonRole::RejectRole);
+  /*const auto abortBtn = */
+  askDataOverwrite.addButton("Abort", QMessageBox::ButtonRole::RejectRole);
   askDataOverwrite.setDefaultButton(QMessageBox::StandardButton::No);
   askDataOverwrite.setIcon(QMessageBox::Icon::Question);
 
@@ -844,8 +843,7 @@ void MainWindow::onMigrateClicked()
   for(const auto& subDir : {"saves", "ghosts", "screenshots"})
     copyDir(QFileInfo{fileName}.path(), userDataDir, subDir, overwrite);
 
-  const auto newConfig = userDataDir / "config.yaml";
-  if(overwrite || !std::filesystem::is_regular_file(newConfig))
+  if(const auto newConfig = userDataDir / "config.yaml"; overwrite || !std::filesystem::is_regular_file(newConfig))
   {
     if(std::filesystem::is_regular_file(newConfig))
       std::filesystem::remove(newConfig);
@@ -908,8 +906,8 @@ void MainWindow::resetConfig()
 
 void MainWindow::onSelectGlidosClicked()
 {
-  const auto userDataPath = findUserDataDir();
-  if(!userDataPath.has_value() || !std::filesystem::is_regular_file(*userDataPath / "config.yaml"))
+  if(const auto userDataPath = findUserDataDir();
+     !userDataPath.has_value() || !std::filesystem::is_regular_file(*userDataPath / "config.yaml"))
   {
     QMessageBox::warning(
       this, tr("Not Configured"), tr("To be able to configure a texture pack, you need to start the engine once."));
@@ -925,7 +923,8 @@ void MainWindow::onSelectGlidosClicked()
          "file, use the first option. If your texture pack contains a series of folders which are made of 32 numbers "
          "and letters, use the second one."));
     const auto useEquiv = askPackType.addButton("equiv.txt", QMessageBox::ButtonRole::AcceptRole);
-    /*const auto useFolders = */ askPackType.addButton(tr("Folders"), QMessageBox::ButtonRole::AcceptRole);
+    /*const auto useFolders = */
+    askPackType.addButton(tr("Folders"), QMessageBox::ButtonRole::AcceptRole);
     askPackType.setIcon(QMessageBox::Icon::Question);
     askPackType.exec();
     if(askPackType.clickedButton() == useEquiv)
@@ -959,7 +958,7 @@ void MainWindow::setGlidosPath(const std::optional<std::string>& path)
   const auto userDataPath = findUserDataDir();
   gsl_Assert(userDataPath.has_value());
 
-  std::string oldLocale = gsl::not_null{setlocale(LC_NUMERIC, nullptr)}.get();
+  std::string oldLocale = gsl_lite::not_null{setlocale(LC_NUMERIC, nullptr)}.get();
   setlocale(LC_NUMERIC, "C");
 
   std::string buffer;
@@ -972,7 +971,7 @@ void MainWindow::setGlidosPath(const std::optional<std::string>& path)
     file.seekg(0, std::ios::beg);
 
     buffer.resize(size);
-    file.read(buffer.data(), gsl::narrow<std::streamsize>(size));
+    file.read(buffer.data(), gsl_lite::narrow<std::streamsize>(size));
   }
 
   setlocale(LC_NUMERIC, oldLocale.c_str());
@@ -1002,7 +1001,7 @@ void MainWindow::setGlidosPath(const std::optional<std::string>& path)
     }
   }
 
-  oldLocale = gsl::not_null{setlocale(LC_NUMERIC, nullptr)}.get();
+  oldLocale = gsl_lite::not_null{setlocale(LC_NUMERIC, nullptr)}.get();
   setlocale(LC_NUMERIC, "C");
 
   {
@@ -1030,14 +1029,14 @@ void MainWindow::onLaunchClicked()
   const auto languageIdData = languageId.toUtf8();
   const auto gameflowIdData = gameflowId.toUtf8();
   const bool borderlessFullscreen = ui->cbBorderlessFullscreen->checkState();
-  m_launchRequest = {std::string{languageIdData.data(), gsl::narrow<size_t>(languageIdData.size())},
-                     std::string{gameflowIdData.data(), gsl::narrow<size_t>(gameflowIdData.size())},
+  m_launchRequest = {std::string{languageIdData.data(), gsl_lite::narrow<size_t>(languageIdData.size())},
+                     std::string{gameflowIdData.data(), gsl_lite::narrow<size_t>(gameflowIdData.size())},
                      borderlessFullscreen};
 
   NetworkConfig cfg{};
-  cfg.color = {gsl::narrow_cast<uint8_t>(m_ghostColor.red()),
-               gsl::narrow_cast<uint8_t>(m_ghostColor.green()),
-               gsl::narrow_cast<uint8_t>(m_ghostColor.blue())};
+  cfg.color = {gsl_lite::narrow_cast<uint8_t>(m_ghostColor.red()),
+               gsl_lite::narrow_cast<uint8_t>(m_ghostColor.green()),
+               gsl_lite::narrow_cast<uint8_t>(m_ghostColor.blue())};
   cfg.socket = ui->serverSocket->text().toStdString();
   cfg.username = ui->username->text().toStdString();
   cfg.authToken = ui->authToken->text().toStdString();
@@ -1061,7 +1060,7 @@ void MainWindow::onGameflowSelected(const QModelIndex& index)
 
   // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
   m_importButton = new QPushButton(tr("Import Data"), this);
-  QObject::connect(m_importButton, &QPushButton::clicked, this, &MainWindow::onImportClicked);
+  connect(m_importButton, &QPushButton::clicked, this, &MainWindow::onImportClicked);
 
   // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
   ui->gameflowMeta->addWidget(new QLabel(tr("By %1").arg(m_gameflows.data(index, AuthorRole).toString())));
@@ -1069,7 +1068,7 @@ void MainWindow::onGameflowSelected(const QModelIndex& index)
   for(const auto& url : m_gameflows.data(index, UrlsRole).toStringList())
   {
     // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
-    auto lbl = new QLabel();
+    const auto lbl = new QLabel();
     lbl->setText(QString("<a href=\"%1\">%1</a>").arg(url));
     lbl->setTextInteractionFlags(Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard);
     lbl->setOpenExternalLinks(true);
@@ -1095,9 +1094,9 @@ void MainWindow::onChooseColorClicked()
 
 void MainWindow::onTestConnectionClicked()
 {
-  const QUrl url{"coop://" + ui->serverSocket->text()};
-  if(!url.isValid() || url.hasFragment() || url.hasQuery() || !url.path().isEmpty() || url.port() == -1
-     || url.scheme() != "coop" || !url.userInfo().isEmpty())
+  if(const QUrl url{"coop://" + ui->serverSocket->text()}; !url.isValid() || url.hasFragment() || url.hasQuery()
+                                                           || !url.path().isEmpty() || url.port() == -1
+                                                           || url.scheme() != "coop" || !url.userInfo().isEmpty())
   {
     QMessageBox::warning(this,
                          tr("Invalid Connection Settings"),
@@ -1148,11 +1147,10 @@ void MainWindow::downloadedReleasesJson(QNetworkReply* reply)
     return;
   }
 
-  auto releasesData = reply->readAll();
+  const auto releasesData = reply->readAll();
   reply->deleteLater();
 
-  serialization::YAMLDocument<true> doc{releasesData.toStdString()};
-  for(const auto& release : doc.getRoot().children())
+  for(serialization::YAMLDocument<true> doc{releasesData.toStdString()}; const auto& release : doc.getRoot().children())
   {
     auto preview = release.find_child(c4::csubstr("prerelease"));
     if(!preview.readable() || !(preview.type() & ryml::VAL))
@@ -1169,8 +1167,7 @@ void MainWindow::downloadedReleasesJson(QNetworkReply* reply)
       continue;
     }
 
-    auto draft = release.find_child(c4::csubstr("draft"));
-    if(!draft.readable() || !(preview.type() & ryml::VAL))
+    if(auto draft = release.find_child(c4::csubstr("draft")); !draft.readable() || !(preview.type() & ryml::VAL))
     {
       BOOST_LOG_TRIVIAL(warning) << "Could not get draft from release";
       continue;
@@ -1204,10 +1201,11 @@ void MainWindow::downloadedReleasesJson(QNetworkReply* reply)
   }
 }
 
+// ReSharper disable once CppMemberFunctionMayBeConst
 void MainWindow::updateUpdateBar()
 {
   const QSettings settings;
-  auto version = settings.value(LastCheckedVersion);
+  const auto version = settings.value(LastCheckedVersion);
   if(!version.isValid() || version.toString() == "v" CE_VERSION)
   {
     ui->lblUpdateNotification->hide();
@@ -1225,4 +1223,4 @@ void MainWindow::updateUpdateBar()
 
 #ifdef __clang__
 #  pragma clang diagnostic pop
-#endif
+#endif
\ No newline at end of file
diff --git a/src/launcher/mainwindow.h b/src/launcher/mainwindow.h
index ccd3c0150..c5212a6a4 100644
--- a/src/launcher/mainwindow.h
+++ b/src/launcher/mainwindow.h
@@ -18,7 +18,7 @@ class MainWindow;
 namespace launcher
 {
 // NOLINTNEXTLINE(*-include-cleaner)
-class MainWindow : public QMainWindow
+class MainWindow final : public QMainWindow
 {
   // NOLINTNEXTLINE(*-include-cleaner)
   Q_OBJECT
diff --git a/src/launcher/networkconfig.cpp b/src/launcher/networkconfig.cpp
index ba5aa3217..049fc5371 100644
--- a/src/launcher/networkconfig.cpp
+++ b/src/launcher/networkconfig.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <regex>
 
 namespace launcher
@@ -37,20 +37,20 @@ NetworkConfig NetworkConfig::load()
 {
   serialization::YAMLDocument<true> doc{findUserDataDir().value() / "network.yaml"};
   NetworkConfig cfg{};
-  doc.deserialize("config", gsl::not_null{&cfg}, cfg);
+  doc.deserialize("config", gsl_lite::not_null{&cfg}, cfg);
   return cfg;
 }
 
 void NetworkConfig::save()
 {
   serialization::YAMLDocument<false> doc{findUserDataDir().value() / "network.yaml"};
-  doc.serialize("config", gsl::not_null{this}, *this);
+  doc.serialize("config", gsl_lite::not_null{this}, *this);
   doc.write();
 }
 
 bool NetworkConfig::isValid() const
 {
-  if(std::count(socket.begin(), socket.end(), ':') != 1)
+  if(std::ranges::count(socket, ':') != 1)
     return false;
   if(username.empty())
     return false;
diff --git a/src/loader/file/animation.cpp b/src/loader/file/animation.cpp
index 527fc8c33..9322235f5 100644
--- a/src/loader/file/animation.cpp
+++ b/src/loader/file/animation.cpp
@@ -5,7 +5,7 @@
 #include "qs/quantity.h"
 
 #include <boost/log/trivial.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace loader::file
@@ -49,12 +49,13 @@ std::unique_ptr<Animation> Animation::read(io::SDLReader& reader, const bool wit
   animation->poseDataSize = reader.readU8();
   animation->state_id = core::AnimStateId{reader.readU16()};
 
-  animation->speed = core::Speed{gsl::narrow_cast<core::Speed::type>(reader.readI32())};
-  animation->acceleration = core::Acceleration{gsl::narrow_cast<core::Acceleration::type>(reader.readI32())};
+  animation->speed = core::Speed{gsl_lite::narrow_cast<core::Speed::type>(reader.readI32())};
+  animation->acceleration = core::Acceleration{gsl_lite::narrow_cast<core::Acceleration::type>(reader.readI32())};
   if(withLateral)
   {
-    animation->lateralSpeed = core::Speed{gsl::narrow_cast<core::Speed::type>(reader.readI32())};
-    animation->lateralAcceleration = core::Acceleration{gsl::narrow_cast<core::Acceleration::type>(reader.readI32())};
+    animation->lateralSpeed = core::Speed{gsl_lite::narrow_cast<core::Speed::type>(reader.readI32())};
+    animation->lateralAcceleration
+      = core::Acceleration{gsl_lite::narrow_cast<core::Acceleration::type>(reader.readI32())};
   }
 
   animation->firstFrame = core::Frame{static_cast<core::Frame::type>(reader.readU16())};
@@ -72,7 +73,7 @@ std::unique_ptr<Animation> Animation::read(io::SDLReader& reader, const bool wit
 std::unique_ptr<SkeletalModelType> SkeletalModelType::readTr1(io::SDLReader& reader)
 {
   auto moveable = std::make_unique<SkeletalModelType>();
-  moveable->type = gsl::narrow_cast<core::TypeId::type>(reader.readU32());
+  moveable->type = gsl_lite::narrow_cast<core::TypeId::type>(reader.readU32());
   moveable->nMeshes = reader.readI16();
   moveable->mesh_base_index = reader.readU16();
   moveable->bone_index = reader.readU32();
diff --git a/src/loader/file/animation.h b/src/loader/file/animation.h
index 5d2640e5d..e98edfb4d 100644
--- a/src/loader/file/animation.h
+++ b/src/loader/file/animation.h
@@ -11,7 +11,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 
@@ -77,26 +77,29 @@ struct AnimFrame
   Vec pos{};
   uint16_t numValues = 0;
 
-  [[nodiscard]] gsl::span<const uint8_t> getAngleData() const noexcept
+  [[nodiscard]] gsl_lite::span<const uint8_t> getAngleData() const noexcept
   {
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
     const auto begin = reinterpret_cast<const uint8_t*>(this + 1);
-    return {begin, gsl::narrow_cast<std::size_t>(numValues) * sizeof(uint32_t)};
+    return {begin, gsl_lite::narrow_cast<std::size_t>(numValues) * sizeof(uint32_t)};
   }
 
-  [[nodiscard]] gsl::not_null<const AnimFrame*> next() const
+  [[nodiscard]] gsl_lite::not_null<const AnimFrame*> next() const
   {
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-    const auto end = reinterpret_cast<const AnimFrame*>(&*getAngleData().end());
+    const auto begin = reinterpret_cast<const uint8_t*>(this + 1);
+    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+    const auto end
+      = reinterpret_cast<const AnimFrame*>(begin + gsl_lite::narrow_cast<std::size_t>(numValues) * sizeof(uint32_t));
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-    auto next = gsl::not_null{end};
+    auto next = gsl_lite::not_null{end};
     gsl_Assert(next->numValues == numValues);
     return next;
   }
 
-  [[nodiscard]] gsl::not_null<const AnimFrame*> next(size_t n) const
+  [[nodiscard]] gsl_lite::not_null<const AnimFrame*> next(size_t n) const
   {
-    auto result = gsl::not_null{this};
+    auto result = gsl_lite::not_null{this};
     while(n--)
     {
       result = result->next();
@@ -124,7 +127,8 @@ struct Transitions
 {
   core::AnimStateId stateId{uint16_t{0}};
   uint16_t transitionCaseCount{}; // number of ranges (seems to always be 1..5)
-  core::ContainerIndex<uint16_t, engine::world::TransitionCase> firstTransitionCase; // Offset into AnimDispatches[]
+  core::ContainerIndex<uint16_t, engine::world::TransitionCase> firstTransitionCase;
+  // Offset into AnimDispatches[]
 
   /// \brief reads an animation state change.
   static std::unique_ptr<Transitions> read(io::SDLReader& reader);
@@ -132,7 +136,8 @@ struct Transitions
 
 struct Animation
 {
-  core::ContainerOffset<uint32_t, int16_t> poseDataOffset; // byte offset into Frames[] (divide by 2 for Frames[i])
+  core::ContainerOffset<uint32_t, int16_t> poseDataOffset;
+  // byte offset into Frames[] (divide by 2 for Frames[i])
 
   core::Frame segmentLength = 0_frame; // Slowdown factor of this animation
   uint8_t poseDataSize{};              // number of bit16's in Frames[] used by this animation
@@ -170,9 +175,9 @@ struct BoneTreeEntry
 
   [[nodiscard]] glm::vec3 toGl() const noexcept
   {
-    return core::TRVec(core::Length{gsl::narrow_cast<core::Length::type>(x)},
-                       core::Length{gsl::narrow_cast<core::Length::type>(y)},
-                       core::Length{gsl::narrow_cast<core::Length::type>(z)})
+    return core::TRVec(core::Length{gsl_lite::narrow_cast<core::Length::type>(x)},
+                       core::Length{gsl_lite::narrow_cast<core::Length::type>(y)},
+                       core::Length{gsl_lite::narrow_cast<core::Length::type>(z)})
       .toRenderSystem();
   }
 };
@@ -184,19 +189,20 @@ static_assert(sizeof(BoneTreeEntry) == 16, "BoneTreeEntry must be of size 16");
 struct SkeletalModelType
 {
   core::TypeId type{uint16_t{0}};
-  int16_t nMeshes
-    = 0; // number of meshes in this object, or (in case of sprite sequences) the negative number of sprites in the sequence
+  int16_t nMeshes = 0;
+  // number of meshes in this object, or (in case of sprite sequences) the negative number of sprites in the sequence
   core::ContainerIndex<uint16_t,
-                       gsl::not_null<const engine::world::Mesh*>,
+                       gsl_lite::not_null<const engine::world::Mesh*>,
                        gslu::nn_shared<render::scene::Mesh>>
-    mesh_base_index;                                         // starting mesh (offset into MeshPointers[])
-  core::ContainerIndex<uint32_t, int32_t> bone_index;        // offset into MeshTree[]
-  core::ContainerOffset<uint32_t, int16_t> pose_data_offset; // byte offset into Frames[] (divide by 2 for Frames[i])
+    mesh_base_index;                                  // starting mesh (offset into MeshPointers[])
+  core::ContainerIndex<uint32_t, int32_t> bone_index; // offset into MeshTree[]
+  core::ContainerOffset<uint32_t, int16_t> pose_data_offset;
+  // byte offset into Frames[] (divide by 2 for Frames[i])
   core::ContainerIndex<uint16_t, engine::world::Animation> animation_index; // offset into Animations[]
 
-  gsl::span<const BoneTreeEntry> boneTree;
+  gsl_lite::span<const BoneTreeEntry> boneTree;
 
   static std::unique_ptr<SkeletalModelType> readTr1(io::SDLReader& reader);
   static std::unique_ptr<SkeletalModelType> readTr5(io::SDLReader& reader);
 };
-} // namespace loader::file
+} // namespace loader::file
\ No newline at end of file
diff --git a/src/loader/file/audio.cpp b/src/loader/file/audio.cpp
index e767ce032..3b113b8b1 100644
--- a/src/loader/file/audio.cpp
+++ b/src/loader/file/audio.cpp
@@ -21,7 +21,7 @@ std::unique_ptr<SoundSource> SoundSource::read(io::SDLReader& reader)
 std::unique_ptr<SoundEffectProperties> SoundEffectProperties::readTr1(io::SDLReader& reader)
 {
   auto result = std::make_unique<SoundEffectProperties>();
-  result->sample = core::SampleId::type(reader.readU16());
+  result->sample = static_cast<core::SampleId::type>(reader.readU16());
   result->volume = reader.readU16();
   result->chance = reader.readU16();
   result->sampleCountAndLoopType = reader.readU8();
@@ -32,7 +32,7 @@ std::unique_ptr<SoundEffectProperties> SoundEffectProperties::readTr1(io::SDLRea
 std::unique_ptr<SoundEffectProperties> SoundEffectProperties::readTr3(io::SDLReader& reader)
 {
   auto result = std::make_unique<SoundEffectProperties>();
-  result->sample = core::SampleId::type(reader.readU16());
+  result->sample = static_cast<core::SampleId::type>(reader.readU16());
   result->volume = reader.readU8();
   result->sound_range = reader.readU8();
   result->chance = reader.readU8();
diff --git a/src/loader/file/audio.h b/src/loader/file/audio.h
index 5906c7602..0c23d7741 100644
--- a/src/loader/file/audio.h
+++ b/src/loader/file/audio.h
@@ -27,7 +27,7 @@ struct SoundSource final
   static constexpr uint16_t PlayIfRoomsNotSwapped = 0x80;
 
   core::TRVec position;
-  core::SoundEffectId sound_effect_id{uint16_t(0)};
+  core::SoundEffectId sound_effect_id{static_cast<uint16_t>(0)};
   uint16_t flags{};
 
   static std::unique_ptr<SoundSource> read(io::SDLReader& reader);
diff --git a/src/loader/file/color.cpp b/src/loader/file/color.cpp
index 31300c709..5e87d74f3 100644
--- a/src/loader/file/color.cpp
+++ b/src/loader/file/color.cpp
@@ -23,24 +23,22 @@ ByteColor ByteColor::read(io::SDLReader& reader, const bool withAlpha)
 std::unique_ptr<Palette> Palette::readTr1(io::SDLReader& reader)
 {
   auto palette = std::make_unique<Palette>();
-  std::generate(palette->colors.begin(),
-                palette->colors.end(),
-                [&reader]()
-                {
-                  return ByteColor::readTr1(reader);
-                });
+  std::ranges::generate(palette->colors,
+                        [&reader]
+                        {
+                          return ByteColor::readTr1(reader);
+                        });
   return palette;
 }
 
 std::unique_ptr<Palette> Palette::readTr2(io::SDLReader& reader)
 {
   auto palette = std::make_unique<Palette>();
-  std::generate(palette->colors.begin(),
-                palette->colors.end(),
-                [&reader]()
-                {
-                  return ByteColor::readTr2(reader);
-                });
+  std::ranges::generate(palette->colors,
+                        [&reader]
+                        {
+                          return ByteColor::readTr2(reader);
+                        });
   return palette;
 }
 } // namespace loader::file
diff --git a/src/loader/file/color.h b/src/loader/file/color.h
index 1a77b71a9..d7f012c0f 100644
--- a/src/loader/file/color.h
+++ b/src/loader/file/color.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <gl/pixel.h>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace loader::file
@@ -39,15 +39,16 @@ struct ByteColor
     return gl::SRGBA8{r, g, b, a};
   }
 
-  [[nodiscard]] gl::SRGBA8 toTextureColor(uint8_t alphaOverride) const noexcept
+  [[nodiscard]] gl::SRGBA8 toTextureColor(const uint8_t alphaOverride) const noexcept
   {
     return gl::SRGBA8{r, g, b, alphaOverride};
   }
 
   [[nodiscard]] glm::vec3 toGLColor3() const
   {
-    return glm::vec3{
-      gsl::narrow_cast<float>(r) / 255.0f, gsl::narrow_cast<float>(g) / 255.0f, gsl::narrow_cast<float>(b) / 255.0f};
+    return glm::vec3{gsl_lite::narrow_cast<float>(r) / 255.0f,
+                     gsl_lite::narrow_cast<float>(g) / 255.0f,
+                     gsl_lite::narrow_cast<float>(b) / 255.0f};
   }
 
 private:
@@ -72,4 +73,4 @@ struct Palette
 
   static std::unique_ptr<Palette> readTr2(io::SDLReader& reader);
 };
-} // namespace loader::file
+} // namespace loader::file
\ No newline at end of file
diff --git a/src/loader/file/datatypes.cpp b/src/loader/file/datatypes.cpp
index f4817bfe6..754f6a507 100644
--- a/src/loader/file/datatypes.cpp
+++ b/src/loader/file/datatypes.cpp
@@ -19,7 +19,7 @@
 #include <boost/throw_exception.hpp>
 #include <cstddef>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 #include <iosfwd>
 #include <memory>
@@ -34,20 +34,20 @@ std::unique_ptr<StaticMesh> StaticMesh::read(io::SDLReader& reader)
   mesh->mesh = reader.readU16();
 
   auto& visBox = mesh->visibility_box;
-  visBox.x.min = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  visBox.x.max = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  visBox.y.min = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  visBox.y.max = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  visBox.z.min = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  visBox.z.max = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
+  visBox.x.min = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  visBox.x.max = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  visBox.y.min = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  visBox.y.max = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  visBox.z.min = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  visBox.z.max = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
 
   auto& collBox = mesh->collision_box;
-  collBox.x.min = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  collBox.x.max = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  collBox.y.min = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  collBox.y.max = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  collBox.z.min = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  collBox.z.max = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
+  collBox.x.min = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  collBox.x.max = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  collBox.y.min = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  collBox.y.max = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  collBox.z.min = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  collBox.z.max = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
 
   mesh->flags = reader.readU16();
   return mesh;
@@ -58,11 +58,11 @@ std::unique_ptr<Room> Room::readTr1(io::SDLReader& reader)
   auto room = std::make_unique<Room>();
 
   // read and change coordinate system
-  room->position.X = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.X = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
   room->position.Y = 0_len;
-  room->position.Z = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->lowestHeight = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->greatestHeight = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.Z = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->lowestHeight = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->greatestHeight = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
 
   const std::streamsize num_data_words = reader.readU32();
 
@@ -77,12 +77,11 @@ std::unique_ptr<Room> Room::readTr1(io::SDLReader& reader)
   reader.seek(position + num_data_words * 2);
 
   room->portals.resize(reader.readU16());
-  std::generate(room->portals.begin(),
-                room->portals.end(),
-                [&reader, &room]()
-                {
-                  return Portal::read(reader, room->position);
-                });
+  std::ranges::generate(room->portals,
+                        [&reader, &room]
+                        {
+                          return Portal::read(reader, room->position);
+                        });
 
   room->sectorCountZ = reader.readU16();
   room->sectorCountX = reader.readU16();
@@ -99,7 +98,7 @@ std::unique_ptr<Room> Room::readTr1(io::SDLReader& reader)
   reader.readVector(room->staticMeshes, reader.readU16(), &RoomStaticMesh::readTr1);
 
   room->alternateRoom = reader.readI16();
-  room->alternateGroup = uint8_t(0); // Doesn't exist in TR1-3
+  room->alternateGroup = static_cast<uint8_t>(0); // Doesn't exist in TR1-3
 
   room->flags = reader.readU16();
   room->reverbInfo = ReverbType::MediumRoom;
@@ -112,11 +111,11 @@ std::unique_ptr<Room> Room::readTr2(io::SDLReader& reader)
 {
   auto room = std::make_unique<Room>();
   // read and change coordinate system
-  room->position.X = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.X = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
   room->position.Y = 0_len;
-  room->position.Z = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->lowestHeight = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->greatestHeight = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.Z = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->lowestHeight = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->greatestHeight = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
 
   const std::streamsize num_data_words = reader.readU32();
 
@@ -139,7 +138,7 @@ std::unique_ptr<Room> Room::readTr2(io::SDLReader& reader)
   reader.readVector(room->sectors, room->getTotalSectors(), &Sector::read);
 
   // read and make consistent
-  room->ambientShade = core::Shade{gsl::narrow<core::Shade::type>((8191 - reader.readI16()) * 4)};
+  room->ambientShade = core::Shade{gsl_lite::narrow<core::Shade::type>((8191 - reader.readI16()) * 4)};
   room->intensity2 = (8191 - reader.readI16()) * 4;
   room->lightMode = reader.readI16();
 
@@ -147,7 +146,7 @@ std::unique_ptr<Room> Room::readTr2(io::SDLReader& reader)
   reader.readVector(room->staticMeshes, reader.readU16(), &RoomStaticMesh::readTr2);
 
   room->alternateRoom = reader.readI16();
-  room->alternateGroup = uint8_t(0); // Doesn't exist in TR1-3
+  room->alternateGroup = static_cast<uint8_t>(0); // Doesn't exist in TR1-3
 
   room->flags = reader.readU16();
 
@@ -160,7 +159,7 @@ std::unique_ptr<Room> Room::readTr2(io::SDLReader& reader)
     room->reverbInfo = ReverbType::MediumRoom;
   }
 
-  auto v = gsl::narrow_cast<float>(room->ambientShade.get()) / 16384.0f;
+  const auto v = gsl_lite::narrow_cast<float>(room->ambientShade.get()) / 16384.0f;
   room->lightColor = {v, v, v, 1.0f};
   return room;
 }
@@ -170,11 +169,11 @@ std::unique_ptr<Room> Room::readTr3(io::SDLReader& reader)
   auto room = std::make_unique<Room>();
 
   // read and change coordinate system
-  room->position.X = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.X = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
   room->position.Y = 0_len;
-  room->position.Z = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->lowestHeight = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->greatestHeight = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.Z = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->lowestHeight = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->greatestHeight = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
 
   const std::streamsize num_data_words = reader.readU32();
 
@@ -206,7 +205,7 @@ std::unique_ptr<Room> Room::readTr3(io::SDLReader& reader)
   reader.readVector(room->staticMeshes, reader.readU16(), &RoomStaticMesh::readTr3);
 
   room->alternateRoom = reader.readI16();
-  room->alternateGroup = uint8_t(0); // Doesn't exist in TR1-3
+  room->alternateGroup = static_cast<uint8_t>(0); // Doesn't exist in TR1-3
 
   room->flags = reader.readU16();
 
@@ -223,7 +222,7 @@ std::unique_ptr<Room> Room::readTr3(io::SDLReader& reader)
 
   reader.skip(1); // Alternate_group override?
 
-  auto v = gsl::narrow_cast<float>(room->ambientShade.get()) / 65535.0f;
+  const auto v = gsl_lite::narrow_cast<float>(room->ambientShade.get()) / 65535.0f;
   room->lightColor = {v, v, v, 1.0f};
   return room;
 }
@@ -232,11 +231,11 @@ std::unique_ptr<Room> Room::readTr4(io::SDLReader& reader)
 {
   auto room = std::make_unique<Room>();
   // read and change coordinate system
-  room->position.X = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.X = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
   room->position.Y = 0_len;
-  room->position.Z = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->lowestHeight = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->greatestHeight = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.Z = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->lowestHeight = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->greatestHeight = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
 
   const std::streamsize num_data_words = reader.readU32();
 
@@ -280,12 +279,12 @@ std::unique_ptr<Room> Room::readTr4(io::SDLReader& reader)
   room->alternateGroup = reader.readU8();
 
   // FIXME r differs from g, b and a
-  room->lightColor.r = gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room->intensity2), 0, 8)) / 255.0f;
+  room->lightColor.r = gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room->intensity2), 0, 8)) / 255.0f;
   room->lightColor.g
-    = gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room->ambientShade.get()), 8, 8)) / 255.0f;
+    = gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room->ambientShade.get()), 8, 8)) / 255.0f;
   room->lightColor.b
-    = gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room->ambientShade.get()), 0, 8)) / 255.0f;
-  room->lightColor.a = gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room->intensity2), 8, 8)) / 255.0f;
+    = gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room->ambientShade.get()), 0, 8)) / 255.0f;
+  room->lightColor.a = gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room->intensity2), 8, 8)) / 255.0f;
   return room;
 }
 
@@ -316,19 +315,19 @@ std::unique_ptr<Room> Room::readTr5(io::SDLReader& reader)
   const std::streampos static_meshes_offset = reader.readU32(); // endPortalOffset
   // static_meshes_offset or room_layer_offset
   // read and change coordinate system
-  room->position.X = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->position.Y = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->position.Z = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->lowestHeight = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  room->greatestHeight = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.X = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.Y = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->position.Z = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->lowestHeight = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  room->greatestHeight = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
 
   room->sectorCountZ = reader.readU16();
   room->sectorCountX = reader.readU16();
 
-  room->lightColor.b = gsl::narrow_cast<float>(reader.readU8()) / 255.0f;
-  room->lightColor.g = gsl::narrow_cast<float>(reader.readU8()) / 255.0f;
-  room->lightColor.r = gsl::narrow_cast<float>(reader.readU8()) / 255.0f;
-  room->lightColor.a = gsl::narrow_cast<float>(reader.readU8()) / 255.0f;
+  room->lightColor.b = gsl_lite::narrow_cast<float>(reader.readU8()) / 255.0f;
+  room->lightColor.g = gsl_lite::narrow_cast<float>(reader.readU8()) / 255.0f;
+  room->lightColor.r = gsl_lite::narrow_cast<float>(reader.readU8()) / 255.0f;
+  room->lightColor.a = gsl_lite::narrow_cast<float>(reader.readU8()) / 255.0f;
 
   room->lights.resize(reader.readU16());
   if(room->lights.size() > 512)
@@ -340,7 +339,7 @@ std::unique_ptr<Room> Room::readTr5(io::SDLReader& reader)
 
   room->reverbInfo = static_cast<ReverbType>(reader.readU8());
   room->alternateGroup = reader.readU8();
-  room->waterScheme = gsl::narrow<uint8_t>(reader.readU16());
+  room->waterScheme = gsl_lite::narrow<uint8_t>(reader.readU16());
 
   if(reader.readU32() != 0x00007FFF)
     BOOST_LOG_TRIVIAL(warning) << "TR5 Room: filler1 has wrong value";
@@ -414,8 +413,7 @@ std::unique_ptr<Room> Room::readTr5(io::SDLReader& reader)
 
   /*light_size*/
   reader.skip(sizeof(uint32_t));
-  const auto numL2 = reader.readU32();
-  if(numL2 != room->lights.size())
+  if(const auto numL2 = reader.readU32(); numL2 != room->lights.size())
     BOOST_THROW_EXCEPTION(std::runtime_error("TR5 Room: numLights2 != lights.size()"));
 
   room->unknown_r6 = reader.readU32();
@@ -427,8 +425,7 @@ std::unique_ptr<Room> Room::readTr5(io::SDLReader& reader)
   const std::streampos layer_offset = reader.readU32();
   const std::streampos vertices_offset = reader.readU32();
   const std::streampos poly_offset = reader.readU32();
-  const std::streampos poly_offset2 = reader.readU32();
-  if(poly_offset != poly_offset2)
+  if(const std::streampos poly_offset2 = reader.readU32(); poly_offset != poly_offset2)
     BOOST_THROW_EXCEPTION(std::runtime_error("TR5 Room: poly_offset != poly_offset2"));
 
   const auto vertices_size = reader.readU32();
@@ -447,14 +444,13 @@ std::unique_ptr<Room> Room::readTr5(io::SDLReader& reader)
   if(reader.readU32() != 0xCDCDCDCD)
     BOOST_LOG_TRIVIAL(warning) << "TR5 Room: separator18 has wrong value";
 
-  std::generate(room->lights.begin(),
-                room->lights.end(),
-                [&reader]()
-                {
-                  return Light::readTr5(reader);
-                });
+  std::ranges::generate(room->lights,
+                        [&reader]
+                        {
+                          return Light::readTr5(reader);
+                        });
 
-  reader.seek(position + std::streamoff(208) + sector_data_offset);
+  reader.seek(position + static_cast<std::streamoff>(208) + sector_data_offset);
 
   reader.readVector(room->sectors, room->getTotalSectors(), &Sector::read);
 
@@ -462,25 +458,23 @@ std::unique_ptr<Room> Room::readTr5(io::SDLReader& reader)
   for(size_t i = 0; i < room->portals.size(); i++)
     room->portals[i] = Portal::read(reader, room->position);
 
-  reader.seek(position + std::streamoff(208) + static_meshes_offset);
+  reader.seek(position + static_cast<std::streamoff>(208) + static_meshes_offset);
 
-  std::generate(room->staticMeshes.begin(),
-                room->staticMeshes.end(),
-                [&reader]()
-                {
-                  return RoomStaticMesh::readTr4(reader);
-                });
+  std::ranges::generate(room->staticMeshes,
+                        [&reader]
+                        {
+                          return RoomStaticMesh::readTr4(reader);
+                        });
 
-  reader.seek(position + std::streamoff(208) + layer_offset);
+  reader.seek(position + static_cast<std::streamoff>(208) + layer_offset);
 
-  std::generate(room->layers.begin(),
-                room->layers.end(),
-                [&reader]()
-                {
-                  return Layer::read(reader);
-                });
+  std::ranges::generate(room->layers,
+                        [&reader]
+                        {
+                          return Layer::read(reader);
+                        });
 
-  reader.seek(position + std::streamoff(208) + poly_offset);
+  reader.seek(position + static_cast<std::streamoff>(208) + poly_offset);
 
   {
     VertexIndex::index_type vertex_index = 0;
@@ -512,7 +506,7 @@ std::unique_ptr<Room> Room::readTr5(io::SDLReader& reader)
     }
   }
 
-  reader.seek(position + std::streamoff(208) + vertices_offset);
+  reader.seek(position + static_cast<std::streamoff>(208) + vertices_offset);
 
   {
     uint32_t vertex_index = 0;
@@ -557,9 +551,9 @@ Sector Sector::read(io::SDLReader& reader)
   sector.floorDataIndex = reader.readU16();
   sector.boxIndex = reader.readI16();
   sector.roomIndexBelow = reader.readU8();
-  sector.floorHeight = core::QuarterSectorSize * gsl::narrow_cast<core::Length::type>(reader.readI8());
+  sector.floorHeight = core::QuarterSectorSize * gsl_lite::narrow_cast<core::Length::type>(reader.readI8());
   sector.roomIndexAbove = reader.readU8();
-  sector.ceilingHeight = core::QuarterSectorSize * gsl::narrow_cast<core::Length::type>(reader.readI8());
+  sector.ceilingHeight = core::QuarterSectorSize * gsl_lite::narrow_cast<core::Length::type>(reader.readI8());
   return sector;
 }
 
@@ -568,7 +562,7 @@ Light Light::readTr1(io::SDLReader& reader)
   Light light;
   light.position = readCoordinates32(reader);
   light.intensity = core::Intensity{reader.readI16()};
-  light.fadeDistance = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  light.fadeDistance = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
   return light;
 }
 
@@ -578,8 +572,8 @@ Light Light::readTr2(io::SDLReader& reader)
   light.position = readCoordinates32(reader);
   light.intensity = core::Intensity{reader.readI16()};
   light.intensity2 = core::Intensity{reader.readI16()};
-  light.fadeDistance = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  light.fade2 = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  light.fadeDistance = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  light.fade2 = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
 
   light.r_outer = light.fadeDistance;
   light.r_inner = light.fadeDistance / 2;
@@ -601,8 +595,8 @@ Light Light::readTr3(io::SDLReader& reader)
   light.color.g = reader.readU8();
   light.color.b = reader.readU8();
   light.color.a = reader.readU8();
-  light.fadeDistance = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  light.fade2 = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  light.fadeDistance = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  light.fade2 = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
 
   light.r_outer = light.fadeDistance;
   light.r_inner = light.fadeDistance / 2;
@@ -619,10 +613,10 @@ Light Light::readTr4(io::SDLReader& reader)
   light.light_type = reader.readU8();
   light.unknown = reader.readU8();
   light.intensity = core::Intensity{static_cast<int16_t>(static_cast<uint16_t>(reader.readU8()))};
-  light.r_inner = core::Length{gsl::narrow<core::Length::type>(reader.readF())};
-  light.r_outer = core::Length{gsl::narrow<core::Length::type>(reader.readF())};
-  light.length = core::Length{gsl::narrow<core::Length::type>(reader.readF())};
-  light.cutoff = core::Length{gsl::narrow<core::Length::type>(reader.readF())};
+  light.r_inner = core::Length{gsl_lite::narrow<core::Length::type>(reader.readF())};
+  light.r_outer = core::Length{gsl_lite::narrow<core::Length::type>(reader.readF())};
+  light.length = core::Length{gsl_lite::narrow<core::Length::type>(reader.readF())};
+  light.cutoff = core::Length{gsl_lite::narrow<core::Length::type>(reader.readF())};
   light.dir = readCoordinatesF(reader);
   return light;
 }
@@ -631,16 +625,16 @@ Light Light::readTr5(io::SDLReader& reader)
 {
   Light light;
   light.position = readCoordinatesF(reader);
-  light.color.r = gsl::narrow<uint8_t>(reader.readF() * 255); // r
-  light.color.g = gsl::narrow<uint8_t>(reader.readF() * 255); // g
-  light.color.b = gsl::narrow<uint8_t>(reader.readF() * 255); // b
-  light.color.a = gsl::narrow<uint8_t>(reader.readF() * 255); // a
+  light.color.r = gsl_lite::narrow<uint8_t>(reader.readF() * 255); // r
+  light.color.g = gsl_lite::narrow<uint8_t>(reader.readF() * 255); // g
+  light.color.b = gsl_lite::narrow<uint8_t>(reader.readF() * 255); // b
+  light.color.a = gsl_lite::narrow<uint8_t>(reader.readF() * 255); // a
   /*
-      if ((temp != 0) && (temp != 0xCDCDCDCD))
-      BOOST_THROW_EXCEPTION( TR_ReadError("read_tr5_room_light: separator1 has wrong value") );
-      */
-  light.r_inner = core::Length{gsl::narrow<core::Length::type>(reader.readF())};
-  light.r_outer = core::Length{gsl::narrow<core::Length::type>(reader.readF())};
+if ((temp != 0) && (temp != 0xCDCDCDCD))
+BOOST_THROW_EXCEPTION( TR_ReadError("read_tr5_room_light: separator1 has wrong value") );
+*/
+  light.r_inner = core::Length{gsl_lite::narrow<core::Length::type>(reader.readF())};
+  light.r_outer = core::Length{gsl_lite::narrow<core::Length::type>(reader.readF())};
   reader.skip(sizeof(float)); // rad_input
   reader.skip(sizeof(float)); // rad_output
   reader.skip(sizeof(float)); // range
@@ -715,12 +709,12 @@ RoomVertex RoomVertex::readTr2(io::SDLReader& reader)
   RoomVertex room_vertex;
   room_vertex.position = readCoordinates16(reader);
   // read and make consistent
-  room_vertex.shade = core::Shade{gsl::narrow<core::Shade::type>((8191 - reader.readI16()) * 4)};
+  room_vertex.shade = core::Shade{gsl_lite::narrow<core::Shade::type>((8191 - reader.readI16()) * 4)};
   room_vertex.attributes = reader.readU16();
   room_vertex.lighting2 = (8191 - reader.readI16()) * 4;
   // only in TR5
   room_vertex.normal = {0_len, 0_len, 0_len};
-  const auto f = gsl::narrow_cast<float>(room_vertex.lighting2) / 32768.0f;
+  const auto f = gsl_lite::narrow_cast<float>(room_vertex.lighting2) / 32768.0f;
   room_vertex.color = {f, f, f, 1};
   return room_vertex;
 }
@@ -735,10 +729,11 @@ RoomVertex RoomVertex::readTr3(io::SDLReader& reader)
   room_vertex.lighting2 = reader.readI16();
   // only in TR5
   room_vertex.normal = {0_len, 0_len, 0_len};
-  room_vertex.color = {gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 10, 5)) / 62.0f,
-                       gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 5, 5)) / 62.0f,
-                       gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 0, 5)) / 62.0f,
-                       1};
+  room_vertex.color
+    = {gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 10, 5)) / 62.0f,
+       gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 5, 5)) / 62.0f,
+       gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 0, 5)) / 62.0f,
+       1};
   return room_vertex;
 }
 
@@ -753,10 +748,11 @@ RoomVertex RoomVertex::readTr4(io::SDLReader& reader)
   // only in TR5
   room_vertex.normal = {0_len, 0_len, 0_len};
 
-  room_vertex.color = {gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 10, 5)) / 31.0f,
-                       gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 5, 5)) / 31.0f,
-                       gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 0, 5)) / 31.0f,
-                       1};
+  room_vertex.color
+    = {gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 10, 5)) / 31.0f,
+       gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 5, 5)) / 31.0f,
+       gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_vertex.lighting2), 0, 5)) / 31.0f,
+       1};
   return room_vertex;
 }
 
@@ -783,8 +779,10 @@ std::unique_ptr<Sprite> Sprite::readTr1(io::SDLReader& reader)
     BOOST_LOG_TRIVIAL(warning) << "TR1 Sprite Atlas ID > 64";
   }
 
-  sprite->uv0.x = UVCoordinates::Component{gsl::narrow_cast<UVCoordinates::Component::type>(reader.readU8() * 256)};
-  sprite->uv0.y = UVCoordinates::Component{gsl::narrow_cast<UVCoordinates::Component::type>(reader.readU8() * 256)};
+  sprite->uv0.x
+    = UVCoordinates::Component{gsl_lite::narrow_cast<UVCoordinates::Component::type>(reader.readU8() * 256)};
+  sprite->uv0.y
+    = UVCoordinates::Component{gsl_lite::narrow_cast<UVCoordinates::Component::type>(reader.readU8() * 256)};
   auto uvSize = UVCoordinates::read(reader);
   sprite->uv1.x = (sprite->uv0.x + uvSize.x).cast<UVCoordinates::Component>();
   sprite->uv1.y = (sprite->uv0.y + uvSize.y).cast<UVCoordinates::Component>();
@@ -848,11 +846,11 @@ std::unique_ptr<SpriteSequence> SpriteSequence::read(io::SDLReader& reader)
 std::unique_ptr<Box> Box::readTr1(io::SDLReader& reader)
 {
   auto box = std::make_unique<Box>();
-  box->zmin = 1_len * gsl::narrow_cast<core::Length::type>(reader.readI32());
-  box->zmax = 1_len * gsl::narrow_cast<core::Length::type>(reader.readI32());
-  box->xmin = 1_len * gsl::narrow_cast<core::Length::type>(reader.readI32());
-  box->xmax = 1_len * gsl::narrow_cast<core::Length::type>(reader.readI32());
-  box->floor = 1_len * gsl::narrow_cast<core::Length::type>(reader.readI16());
+  box->zmin = 1_len * gsl_lite::narrow_cast<core::Length::type>(reader.readI32());
+  box->zmax = 1_len * gsl_lite::narrow_cast<core::Length::type>(reader.readI32());
+  box->xmin = 1_len * gsl_lite::narrow_cast<core::Length::type>(reader.readI32());
+  box->xmax = 1_len * gsl_lite::narrow_cast<core::Length::type>(reader.readI32());
+  box->floor = 1_len * gsl_lite::narrow_cast<core::Length::type>(reader.readI16());
   const auto tmp = reader.readU16();
   box->overlap_index = tmp & ((1u << 14u) - 1u);
   box->blocked = (tmp & 0x4000u) != 0;
@@ -867,11 +865,11 @@ std::unique_ptr<Box> Box::readTr1(io::SDLReader& reader)
 std::unique_ptr<Box> Box::readTr2(io::SDLReader& reader)
 {
   auto box = std::make_unique<Box>();
-  box->zmin = 1_sectors * gsl::narrow_cast<core::Length::type>(reader.readI8());
-  box->zmax = 1_sectors * gsl::narrow_cast<core::Length::type>(reader.readI8());
-  box->xmin = 1_sectors * gsl::narrow_cast<core::Length::type>(reader.readI8());
-  box->xmax = 1_sectors * gsl::narrow_cast<core::Length::type>(reader.readI8());
-  box->floor = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
+  box->zmin = 1_sectors * gsl_lite::narrow_cast<core::Length::type>(reader.readI8());
+  box->zmax = 1_sectors * gsl_lite::narrow_cast<core::Length::type>(reader.readI8());
+  box->xmin = 1_sectors * gsl_lite::narrow_cast<core::Length::type>(reader.readI8());
+  box->xmax = 1_sectors * gsl_lite::narrow_cast<core::Length::type>(reader.readI8());
+  box->floor = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
   const auto tmp = reader.readU16();
   box->overlap_index = tmp & ((1u << 14u) - 1u);
   box->blocked = (tmp & 0x4000u) != 0;
@@ -949,4 +947,4 @@ SpriteInstance SpriteInstance::read(io::SDLReader& reader)
   room_sprite.id = reader.readU16();
   return room_sprite;
 }
-} // namespace loader::file
+} // namespace loader::file
\ No newline at end of file
diff --git a/src/loader/file/datatypes.h b/src/loader/file/datatypes.h
index f5825f2b5..6e8a9d2ab 100644
--- a/src/loader/file/datatypes.h
+++ b/src/loader/file/datatypes.h
@@ -16,7 +16,7 @@
 #include <cstdint>
 #include <glm/vec2.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <vector>
 
@@ -39,7 +39,7 @@ constexpr uint16_t AtlasIdMask = 0x0FFF;
 
 struct Portal
 {
-  core::RoomId16 adjoining_room{uint16_t(0)}; ///< \brief which room this portal leads to.
+  core::RoomId16 adjoining_room{static_cast<uint16_t>(0)}; ///< \brief which room this portal leads to.
   core::TRVec normal;
   //! Vertices in world space
   std::array<core::TRVec, 4> vertices;
@@ -50,16 +50,17 @@ struct Portal
 struct Sector
 {
   /**
-     * @brief Index into FloorData[]
-     *
-     * @note If this is 0, no floor data is attached to this sector.
-     */
+* @brief Index into FloorData[]
+*
+* @note If this is 0, no floor data is attached to this sector.
+*/
   core::ContainerIndex<uint16_t, engine::floordata::FloorDataValue> floorDataIndex;
 
-  core::BoxId boxIndex{int16_t(-1)};              //!< Index into Boxes[]/Zones[] (-1 if none)
-  core::RoomId8 roomIndexBelow{uint8_t(-1)};      //!< The number of the room below this one (255 if none)
-  core::Length floorHeight = core::InvalidHeight; //!< Absolute height of floor (multiply by 256 for world coordinates)
-  core::RoomId8 roomIndexAbove{uint8_t(-1)};      //!< The number of the room above this one (255 if none)
+  core::BoxId boxIndex{static_cast<int16_t>(-1)};         //!< Index into Boxes[]/Zones[] (-1 if none)
+  core::RoomId8 roomIndexBelow{static_cast<uint8_t>(-1)}; //!< The number of the room below this one (255 if none)
+  core::Length floorHeight = core::InvalidHeight;
+  //!< Absolute height of floor (multiply by 256 for world coordinates)
+  core::RoomId8 roomIndexAbove{static_cast<uint8_t>(-1)}; //!< The number of the room above this one (255 if none)
   core::Length ceilingHeight
     = core::InvalidHeight; //!< Absolute height of ceiling (multiply by 256 for world coordinates)
 
@@ -120,10 +121,10 @@ struct Light
   }
 
   /** \brief reads a room light definition.
-      *
-      * darkness gets converted, so it matches the 0-32768 range introduced in TR3.
-      * intensity2 and fade2 are introduced in TR2 and are set to darkness and fade1 for TR1.
-      */
+*
+* darkness gets converted, so it matches the 0-32768 range introduced in TR3.
+* intensity2 and fade2 are introduced in TR2 and are set to darkness and fade1 for TR1.
+*/
   static Light readTr1(io::SDLReader& reader);
 
   static Light readTr2(io::SDLReader& reader);
@@ -139,15 +140,15 @@ struct SpriteInstance
 {
   DECLARE_ID(VertexId, uint16_t);
 
-  VertexId vertex{uint16_t(0)}; // offset into vertex list
-  core::SpriteInstanceId id{uint16_t(0)};
+  VertexId vertex{static_cast<uint16_t>(0)}; // offset into vertex list
+  core::SpriteInstanceId id{static_cast<uint16_t>(0)};
 
   /// \brief reads a room sprite definition.
   static SpriteInstance read(io::SDLReader& reader);
 };
 
 /** \brief Room layer (TR5).
-  */
+*/
 struct Layer
 {
   uint16_t num_vertices;
@@ -192,12 +193,12 @@ struct RoomVertex
   glm::vec4 color{0.0f};
 
   /** \brief reads a room vertex definition.
-      *
-      * lighting1 gets converted, so it matches the 0-32768 range introduced in TR3.
-      * lighting2 is introduced in TR2 and is set to lighting1 for TR1.
-      * attributes is introduced in TR2 and is set 0 for TR1.
-      * All other values are introduced in TR5 and get set to appropriate values.
-      */
+*
+* lighting1 gets converted, so it matches the 0-32768 range introduced in TR3.
+* lighting2 is introduced in TR2 and is set to lighting1 for TR1.
+* attributes is introduced in TR2 and is set 0 for TR1.
+* All other values are introduced in TR5 and get set to appropriate values.
+*/
   static RoomVertex readTr1(io::SDLReader& reader);
 
   static RoomVertex readTr2(io::SDLReader& reader);
@@ -241,7 +242,8 @@ struct Room
 
   static constexpr uint16_t TR_ROOM_FLAG_WIND = 0x0020;
 
-  static constexpr uint16_t TR_ROOM_FLAG_UNKNOWN2 = 0x0040; ///< @FIXME: Find what it means!!! Always set by Dxtre3d.
+  static constexpr uint16_t TR_ROOM_FLAG_UNKNOWN2 = 0x0040;
+  ///< @FIXME: Find what it means!!! Always set by Dxtre3d.
   static constexpr uint16_t TR_ROOM_FLAG_NO_LENSFLARE = 0x0080; // In TR4-5. Was quicksand in TR3.
   static constexpr uint16_t TR_ROOM_FLAG_MIST = 0x0100;
   static constexpr uint16_t TR1_ROOM_FLAG_SKYBOX = 0x0100;
@@ -269,9 +271,9 @@ struct Room
   int16_t intensity2{};      // Almost always the same value as AmbientIntensity1 [absent from TR1 data files]
   int16_t lightMode{};       // (present only in TR2: 0 is normal, 1 is flickering(?), 2 and 3 are uncertain)
   std::vector<Light> lights; // [NumLights] list of point lights
-  std::vector<RoomStaticMesh> staticMeshes;     // [NumStaticMeshes]list of static meshes
-  core::RoomIdI16 alternateRoom{int16_t(-1)};   // number of the room that this room can alternate
-  core::RoomGroupId alternateGroup{uint8_t(0)}; // number of group which is used to switch alternate rooms
+  std::vector<RoomStaticMesh> staticMeshes;                  // [NumStaticMeshes]list of static meshes
+  core::RoomIdI16 alternateRoom{static_cast<int16_t>(-1)};   // number of the room that this room can alternate
+  core::RoomGroupId alternateGroup{static_cast<uint8_t>(0)}; // number of group which is used to switch alternate rooms
   // with (e.g. empty/filled with water is implemented as an empty room that alternates with a full room)
 
   uint16_t flags{};
@@ -320,12 +322,12 @@ struct Room
   uint32_t unknown_r6{};
 
   /** \brief reads a room definition.
-      *
-      * darkness gets converted, so it matches the 0-32768 range introduced in TR3.
-      * intensity2 is introduced in TR2 and is set to darkness for TR1.
-      * light_mode is only in TR2 and is set 0 for TR1.
-      * light_color is only in TR3-4 and gets set appropriately.
-      */
+*
+* darkness gets converted, so it matches the 0-32768 range introduced in TR3.
+* intensity2 is introduced in TR2 and is set to darkness for TR1.
+* light_mode is only in TR2 and is set 0 for TR1.
+* light_color is only in TR3-4 and gets set appropriately.
+*/
   static std::unique_ptr<Room> readTr1(io::SDLReader& reader);
 
   static std::unique_ptr<Room> readTr2(io::SDLReader& reader);
@@ -338,13 +340,13 @@ struct Room
 
   [[nodiscard]] constexpr size_t getTotalSectors() const
   {
-    return gsl::narrow_cast<size_t>(sectorCountX) * gsl::narrow_cast<size_t>(sectorCountZ);
+    return gsl_lite::narrow_cast<size_t>(sectorCountX) * gsl_lite::narrow_cast<size_t>(sectorCountZ);
   }
 };
 
 struct Sprite
 {
-  core::AtlasId atlas_id{uint16_t(0)};
+  core::AtlasId atlas_id{static_cast<uint16_t>(0)};
 
   UVCoordinates uv0;
   UVCoordinates uv1;
@@ -358,9 +360,9 @@ struct Sprite
 
 struct SpriteSequence
 {
-  core::TypeId type{uint16_t(0)}; // Item identifier (matched in Items[])
-  int16_t length = 0;             // negative of "how many sprites are in this sequence"
-  uint16_t offset = 0;            // where (in sprite texture list) this sequence starts
+  core::TypeId type{static_cast<uint16_t>(0)}; // Item identifier (matched in Items[])
+  int16_t length = 0;                          // negative of "how many sprites are in this sequence"
+  uint16_t offset = 0;                         // where (in sprite texture list) this sequence starts
 
   static std::unique_ptr<SpriteSequence> readTr1(io::SDLReader& reader);
   static std::unique_ptr<SpriteSequence> read(io::SDLReader& reader);
@@ -440,7 +442,7 @@ struct FlybyCamera
 
 struct AIObject
 {
-  core::ItemId object_id{uint16_t(0)}; // the objectID from the AI object (AI_FOLLOW is 402)
+  core::ItemId object_id{static_cast<uint16_t>(0)}; // the objectID from the AI object (AI_FOLLOW is 402)
   uint16_t room{};
   int32_t x{};
   int32_t y{};
@@ -469,4 +471,4 @@ struct LightMap
   /// \brief reads the lightmap.
   static std::unique_ptr<LightMap> read(io::SDLReader& reader);
 };
-} // namespace loader::file
+} // namespace loader::file
\ No newline at end of file
diff --git a/src/loader/file/io/sdlreader.h b/src/loader/file/io/sdlreader.h
index 242c1df45..c1de3ac3f 100644
--- a/src/loader/file/io/sdlreader.h
+++ b/src/loader/file/io/sdlreader.h
@@ -16,6 +16,7 @@
 #endif
 
 #include <boost/throw_exception.hpp>
+#include <concepts>
 #include <cstddef>
 #include <cstdint>
 #include <filesystem>
@@ -85,7 +86,8 @@ class SDLReader
     std::vector<char> uncomp_buffer(uncompressedSize);
 
     auto actuallyUncompressedSize = static_cast<uLongf>(uncompressedSize);
-    if(uncompress(reinterpret_cast<Bytef*>(uncomp_buffer.data()), // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
+    if(uncompress(reinterpret_cast<Bytef*>(uncomp_buffer.data()),
+                  // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
                   &actuallyUncompressedSize,
                   compressed.data(),
                   static_cast<uLong>(compressed.size()))
@@ -121,22 +123,24 @@ class SDLReader
     return size;
   }
 
+  // ReSharper disable once CppMemberFunctionMayBeConst
   void skip(const std::streamoff delta)
   {
     m_stream.seekg(delta, std::ios::cur);
   }
 
+  // ReSharper disable once CppMemberFunctionMayBeConst
   void seek(const std::streampos& position)
   {
     m_stream.seekg(position, std::ios::beg);
   }
 
-  template<typename T>
+  template<std::integral T>
   void readBytes(T* dest, const size_t n)
   {
-    static_assert(std::is_integral_v<T> && sizeof(T) == 1, "readBytes() only allowed for byte-compatible data");
+    static_assert(sizeof(T) == 1, "readBytes() only allowed for byte-compatible data");
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-    m_stream.read(reinterpret_cast<char*>(dest), gsl::narrow<std::streamsize>(n));
+    m_stream.read(reinterpret_cast<char*>(dest), gsl_lite::narrow<std::streamsize>(n));
     if(static_cast<size_t>(m_stream.gcount()) != n)
     {
       BOOST_THROW_EXCEPTION(std::runtime_error("EOF unexpectedly reached"));
@@ -150,21 +154,21 @@ class SDLReader
   using StackProducer = T(SDLReader&, Args... args);
 
   template<typename T, typename... Args>
-  void readVector(std::vector<T>& elements, size_t count, PtrProducer<T, Args...> producer, Args... args)
+  void readVector(std::vector<T>& elements, const size_t count, PtrProducer<T, Args...> producer, Args... args)
   {
     elements.clear();
     appendVector(elements, count, producer, args...);
   }
 
   template<typename T, typename... Args>
-  void readVector(std::vector<T>& elements, size_t count, StackProducer<T, Args...> producer, Args... args)
+  void readVector(std::vector<T>& elements, const size_t count, StackProducer<T, Args...> producer, Args... args)
   {
     elements.clear();
     appendVector(elements, count, producer, args...);
   }
 
   template<typename T, typename... Args>
-  void appendVector(std::vector<T>& elements, size_t count, PtrProducer<T, Args...> producer, Args... args)
+  void appendVector(std::vector<T>& elements, const size_t count, PtrProducer<T, Args...> producer, Args... args)
   {
     elements.reserve(elements.size() + count);
     for(size_t i = 0; i < count; ++i)
@@ -175,7 +179,7 @@ class SDLReader
   }
 
   template<typename T, typename... Args>
-  void appendVector(std::vector<T>& elements, size_t count, StackProducer<T, Args...> producer, Args... args)
+  void appendVector(std::vector<T>& elements, const size_t count, StackProducer<T, Args...> producer, Args... args)
   {
     elements.reserve(elements.size() + count);
     for(size_t i = 0; i < count; ++i)
@@ -262,7 +266,7 @@ class SDLReader
 
   mutable std::istream m_stream;
 
-  template<typename T, int dataSize, bool isIntegral>
+  template<typename, int, bool>
   struct SwapTraits
   {
   };
@@ -326,4 +330,4 @@ class SDLReader
     }
   };
 };
-} // namespace loader::file::io
+} // namespace loader::file::io
\ No newline at end of file
diff --git a/src/loader/file/io/util.h b/src/loader/file/io/util.h
index 27f31a060..27cfe6739 100644
--- a/src/loader/file/io/util.h
+++ b/src/loader/file/io/util.h
@@ -4,34 +4,34 @@
 #include "sdlreader.h"
 
 #include <cmath>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace loader::file::io
 {
 inline core::TRVec readCoordinates16(SDLReader& reader)
 {
   core::TRVec vertex;
-  vertex.X = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  vertex.Y = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
-  vertex.Z = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
+  vertex.X = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  vertex.Y = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
+  vertex.Z = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
   return vertex;
 }
 
 inline core::TRVec readCoordinates32(SDLReader& reader)
 {
   core::TRVec vertex;
-  vertex.X = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  vertex.Y = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
-  vertex.Z = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  vertex.X = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  vertex.Y = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
+  vertex.Z = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
   return vertex;
 }
 
 inline core::TRVec readCoordinatesF(SDLReader& reader)
 {
   core::TRVec vertex;
-  vertex.X = core::Length{gsl::narrow_cast<core::Length::type>(std::lround(reader.readF()))};
-  vertex.Y = core::Length{gsl::narrow_cast<core::Length::type>(std::lround(reader.readF()))};
-  vertex.Z = core::Length{gsl::narrow_cast<core::Length::type>(std::lround(reader.readF()))};
+  vertex.X = core::Length{gsl_lite::narrow_cast<core::Length::type>(std::lround(reader.readF()))};
+  vertex.Y = core::Length{gsl_lite::narrow_cast<core::Length::type>(std::lround(reader.readF()))};
+  vertex.Z = core::Length{gsl_lite::narrow_cast<core::Length::type>(std::lround(reader.readF()))};
   return vertex;
 }
-} // namespace loader::file::io
+} // namespace loader::file::io
\ No newline at end of file
diff --git a/src/loader/file/item.h b/src/loader/file/item.h
index 3c6656036..7d5e9fc83 100644
--- a/src/loader/file/item.h
+++ b/src/loader/file/item.h
@@ -16,12 +16,12 @@ class SDLReader;
 
 struct Item
 {
-  core::TypeId type{
-    uint16_t(0)}; //!< Object Identifier (matched in AnimatedModels[], or SpriteSequences[], as appropriate)
-  core::RoomId16 room{uint16_t(0)}; //!< Owning room
-  core::TRVec position;             //!< world coords
-  core::Angle rotation;             //!< ((0xc000 >> 14) * 90) degrees around Y axis
-  core::Shade shade;                //!< (constant lighting; -1 means use mesh lighting)
+  core::TypeId type{static_cast<uint16_t>(
+    0)}; //!< Object Identifier (matched in AnimatedModels[], or SpriteSequences[], as appropriate)
+  core::RoomId16 room{static_cast<uint16_t>(0)}; //!< Owning room
+  core::TRVec position;                          //!< world coords
+  core::Angle rotation;                          //!< ((0xc000 >> 14) * 90) degrees around Y axis
+  core::Shade shade;                             //!< (constant lighting; -1 means use mesh lighting)
   int16_t intensity2 = 0; //!< Like Intensity1, and almost always with the same value. [absent from TR1 data files]
   int16_t ocb = 0;        //!< Object code bit - used for altering entity behaviour. Only in TR4-5.
 
diff --git a/src/loader/file/level/level.cpp b/src/loader/file/level/level.cpp
index 660c3427b..7ae343ca5 100644
--- a/src/loader/file/level/level.cpp
+++ b/src/loader/file/level/level.cpp
@@ -19,7 +19,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 #include <iterator>
 #include <memory>
@@ -50,7 +50,7 @@ void Level::readMeshData(io::SDLReader& reader)
   m_meshes.clear();
   for(const auto offset : uniqueOffsets)
   {
-    reader.seek(basePos + std::streamoff(offset));
+    reader.seek(basePos + static_cast<std::streamoff>(offset));
 
     if(gameToEngine(m_gameVersion) >= Engine::TR4)
       m_meshes.emplace_back(Mesh::readTr4(reader));
@@ -60,15 +60,14 @@ void Level::readMeshData(io::SDLReader& reader)
   gsl_Ensures(m_meshes.size() == uniqueOffsets.size());
 
   m_meshIndices.clear();
-  std::transform(offsets.begin(),
-                 offsets.end(),
-                 std::back_inserter(m_meshIndices),
-                 [&uniqueOffsets](uint32_t offset)
-                 {
-                   auto it = uniqueOffsets.find(offset);
-                   gsl_Assert(it != uniqueOffsets.end());
-                   return gsl::narrow<uint32_t>(std::distance(uniqueOffsets.begin(), it));
-                 });
+  std::ranges::transform(offsets,
+                         std::back_inserter(m_meshIndices),
+                         [&uniqueOffsets](const uint32_t offset)
+                         {
+                           const auto it = uniqueOffsets.find(offset);
+                           gsl_Assert(it != uniqueOffsets.end());
+                           return gsl_lite::narrow<uint32_t>(std::distance(uniqueOffsets.begin(), it));
+                         });
 
   reader.seek(endPos);
 }
@@ -149,7 +148,7 @@ Game Level::probeVersion(io::SDLReader& reader, const std::filesystem::path& fil
   std::array<uint8_t, 4> check{};
   reader.readBytes(check.data(), check.size());
 
-  Game ret = Game::Unknown;
+  auto ret = Game::Unknown;
   if(ext == ".PHD")
   {
     if(check[0] == 0x20 && check[1] == 0x00 && check[2] == 0x00 && check[3] == 0x00)
@@ -211,22 +210,20 @@ Game Level::probeVersion(io::SDLReader& reader, const std::filesystem::path& fil
   return ret;
 }
 
-void Level::convertTexture(ByteTexture& tex, Palette& pal, DWordTexture& dst)
+void Level::convertTexture(const ByteTexture& tex, Palette& pal, DWordTexture& dst)
 {
   for(int y = 0; y < 256; y++)
   {
     for(int x = 0; x < 256; x++)
     {
-      const auto col = tex.pixels[y][x];
-
-      if(col > 0)
+      if(const auto col = tex.pixels[y][x]; col > 0)
         dst.pixels[y][x] = {pal.colors[col].r, pal.colors[col].g, pal.colors[col].b, 255};
       else
         dst.pixels[y][x] = {0, 0, 0, 0};
     }
   }
 
-  dst.md5 = util::md5(&tex.pixels[0][0], gsl::narrow_cast<size_t>(256u * 256u));
+  dst.md5 = util::md5(&tex.pixels[0][0], gsl_lite::narrow_cast<size_t>(256u * 256u));
 }
 
 void Level::convertTexture(const WordTexture& tex, DWordTexture& dst)
@@ -235,9 +232,7 @@ void Level::convertTexture(const WordTexture& tex, DWordTexture& dst)
   {
     for(int x = 0; x < 256; x++)
     {
-      const auto col = tex.pixels[y][x];
-
-      if((col & 0x8000u) != 0)
+      if(const auto col = tex.pixels[y][x]; (col & 0x8000u) != 0)
       {
         const auto r = static_cast<uint8_t>((col & 0x00007c00u) >> 7u);
         const auto g = static_cast<uint8_t>((col & 0x000003e0u) >> 2u);
@@ -251,4 +246,4 @@ void Level::convertTexture(const WordTexture& tex, DWordTexture& dst)
     }
   }
 }
-} // namespace loader::file::level
+} // namespace loader::file::level
\ No newline at end of file
diff --git a/src/loader/file/level/level.h b/src/loader/file/level/level.h
index cace165f4..d07d669ab 100644
--- a/src/loader/file/level/level.h
+++ b/src/loader/file/level/level.h
@@ -86,18 +86,18 @@ class Level
   std::vector<uint16_t> m_animatedTextures;
 
   /*
-     * 0 Normal
-     * 3 Catsuit
-     * 4 Divesuit
-     * 6 Invisible
-     */
+       * 0 Normal
+       * 3 Catsuit
+       * 4 Divesuit
+       * 6 Invisible
+       */
   uint16_t m_laraType = 0;
 
   /*
-     * 0 No weather
-     * 1 Rain
-     * 2 Snow (in title.trc these are red triangles falling from the sky).
-     */
+       * 0 No weather
+       * 1 Rain
+       * 2 Snow (in title.trc these are red triangles falling from the sky).
+       */
   uint16_t m_weatherType = 0;
 
   static std::unique_ptr<Level> createLoader(const std::filesystem::path& filename, Game gameVersion);
@@ -116,7 +116,7 @@ class Level
 
   void readMeshData(io::SDLReader& reader);
 
-  static void convertTexture(ByteTexture& tex, Palette& pal, DWordTexture& dst);
+  static void convertTexture(const ByteTexture& tex, Palette& pal, DWordTexture& dst);
 
   static void convertTexture(const WordTexture& tex, DWordTexture& dst);
 
diff --git a/src/loader/file/level/py_module.h b/src/loader/file/level/py_module.h
index adc46d7a7..d2cd4e27c 100644
--- a/src/loader/file/level/py_module.h
+++ b/src/loader/file/level/py_module.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "game.h"
 
 #include <pybind11/pybind11.h>
diff --git a/src/loader/file/level/tr1level.cpp b/src/loader/file/level/tr1level.cpp
index 2c0b39fae..f3765be0b 100644
--- a/src/loader/file/level/tr1level.cpp
+++ b/src/loader/file/level/tr1level.cpp
@@ -31,9 +31,8 @@ void TR1Level::loadFileData()
   m_reader.seek(0);
 
   // Version
-  const uint32_t file_version = m_reader.readU32();
 
-  if(file_version != 0x00000020)
+  if(const uint32_t file_version = m_reader.readU32(); file_version != 0x00000020)
     BOOST_THROW_EXCEPTION(std::runtime_error("TR1 Level: Wrong level version"));
 
   BOOST_LOG_TRIVIAL(debug) << "Reading textures";
@@ -77,7 +76,7 @@ void TR1Level::loadFileData()
     for(uint32_t i = 0; i < n; ++i)
     {
       auto m = SkeletalModelType::readTr1(m_reader);
-      if(m_animatedModels.find(m->type) != m_animatedModels.end())
+      if(m_animatedModels.contains(m->type))
         BOOST_THROW_EXCEPTION(std::runtime_error("Duplicate type id"));
 
       m_animatedModels[m->type] = std::move(m);
@@ -99,7 +98,7 @@ void TR1Level::loadFileData()
     for(uint32_t i = 0; i < n; ++i)
     {
       auto m = SpriteSequence::readTr1(m_reader);
-      if(m_spriteSequences.find(m->type) != m_spriteSequences.end())
+      if(m_spriteSequences.contains(m->type))
         BOOST_THROW_EXCEPTION(std::runtime_error("Duplicate type id"));
 
       m_spriteSequences[m->type] = std::move(m);
diff --git a/src/loader/file/level/tr2level.cpp b/src/loader/file/level/tr2level.cpp
index cae7064f4..9fb9b603c 100644
--- a/src/loader/file/level/tr2level.cpp
+++ b/src/loader/file/level/tr2level.cpp
@@ -26,9 +26,7 @@ namespace loader::file::level
 void TR2Level::loadFileData()
 {
   // Version
-  const uint32_t file_version = m_reader.readU32();
-
-  if(file_version != 0x0000002d)
+  if(const uint32_t file_version = m_reader.readU32(); file_version != 0x0000002d)
     BOOST_THROW_EXCEPTION(std::runtime_error("TR2 Level: Wrong level version"));
 
   m_palette = Palette::readTr1(m_reader);
@@ -66,7 +64,7 @@ void TR2Level::loadFileData()
     for(uint32_t i = 0; i < n; ++i)
     {
       auto m = SkeletalModelType::readTr1(m_reader);
-      if(m_animatedModels.find(m->type) != m_animatedModels.end())
+      if(m_animatedModels.contains(m->type))
         BOOST_THROW_EXCEPTION(std::runtime_error("Duplicate type id"));
 
       m_animatedModels[m->type] = std::move(m);
@@ -84,7 +82,7 @@ void TR2Level::loadFileData()
     for(uint32_t i = 0; i < n; ++i)
     {
       auto m = SpriteSequence::read(m_reader);
-      if(m_spriteSequences.find(m->type) != m_spriteSequences.end())
+      if(m_spriteSequences.contains(m->type))
         BOOST_THROW_EXCEPTION(std::runtime_error("Duplicate type id"));
 
       m_spriteSequences[m->type] = std::move(m);
@@ -138,8 +136,7 @@ void TR2Level::loadFileData()
   // In TR2, samples are stored in separate file called MAIN.SFX.
   // If there is no such files, no samples are loaded.
 
-  const io::SDLReader newsrc(m_sfxPath);
-  if(!newsrc.isOpen())
+  if(const io::SDLReader newsrc(m_sfxPath); !newsrc.isOpen())
   {
     BOOST_LOG_TRIVIAL(warning) << "TR2 Level: failed to open '" << m_sfxPath << "', no samples loaded.";
   }
diff --git a/src/loader/file/level/tr3level.cpp b/src/loader/file/level/tr3level.cpp
index 1d62d9b4e..11691d314 100644
--- a/src/loader/file/level/tr3level.cpp
+++ b/src/loader/file/level/tr3level.cpp
@@ -72,7 +72,7 @@ void TR3Level::loadFileData()
     for(uint32_t i = 0; i < n; ++i)
     {
       auto m = SkeletalModelType::readTr1(m_reader);
-      if(m_animatedModels.find(m->type) != m_animatedModels.end())
+      if(m_animatedModels.contains(m->type))
         BOOST_THROW_EXCEPTION(std::runtime_error("Duplicate type id"));
 
       m_animatedModels[m->type] = std::move(m);
@@ -88,7 +88,7 @@ void TR3Level::loadFileData()
     for(uint32_t i = 0; i < n; ++i)
     {
       auto m = SpriteSequence::read(m_reader);
-      if(m_spriteSequences.find(m->type) != m_spriteSequences.end())
+      if(m_spriteSequences.contains(m->type))
         BOOST_THROW_EXCEPTION(std::runtime_error("Duplicate type id"));
 
       m_spriteSequences[m->type] = std::move(m);
@@ -140,8 +140,7 @@ void TR3Level::loadFileData()
   // In TR3, samples are stored in separate file called MAIN.SFX.
   // If there is no such files, no samples are loaded.
 
-  const io::SDLReader newsrc{m_sfxPath};
-  if(!newsrc.isOpen())
+  if(const io::SDLReader newsrc{m_sfxPath}; !newsrc.isOpen())
   {
     BOOST_LOG_TRIVIAL(warning) << "TR3 Level: failed to open '" << m_sfxPath << "', no samples loaded.";
   }
diff --git a/src/loader/file/level/tr4level.cpp b/src/loader/file/level/tr4level.cpp
index f5b051a92..bab931f92 100644
--- a/src/loader/file/level/tr4level.cpp
+++ b/src/loader/file/level/tr4level.cpp
@@ -24,9 +24,8 @@ namespace loader::file::level
 void TR4Level::loadFileData()
 {
   // Version
-  const uint32_t file_version = m_reader.readU32();
-
-  if(file_version != 0x00345254 /*&& file_version != 0x63345254*/) // +TRLE
+  if(const uint32_t file_version = m_reader.readU32();
+     file_version != 0x00345254 /*&& file_version != 0x63345254*/) // +TRLE
     BOOST_THROW_EXCEPTION(std::runtime_error("TR4 Level: Wrong level version"));
 
   std::vector<WordTexture> texture16;
@@ -34,7 +33,7 @@ void TR4Level::loadFileData()
     const auto numRoomTextiles = m_reader.readU16();
     const auto numObjTextiles = m_reader.readU16();
     const auto numBumpTextiles = m_reader.readU16();
-    const auto numMiscTextiles = 2;
+    constexpr auto numMiscTextiles = 2;
     const auto numTextiles = numRoomTextiles + numObjTextiles + numBumpTextiles + numMiscTextiles;
 
     uint32_t uncomp_size = m_reader.readU32();
@@ -145,7 +144,7 @@ void TR4Level::loadFileData()
     for(uint32_t i = 0; i < n; ++i)
     {
       auto m = SkeletalModelType::readTr1(m_reader);
-      if(m_animatedModels.find(m->type) != m_animatedModels.end())
+      if(m_animatedModels.contains(m->type))
         BOOST_THROW_EXCEPTION(std::runtime_error("Duplicate type id"));
 
       m_animatedModels[m->type] = std::move(m);
@@ -170,7 +169,7 @@ void TR4Level::loadFileData()
     for(uint32_t i = 0; i < n; ++i)
     {
       auto m = SpriteSequence::read(m_reader);
-      if(m_spriteSequences.find(m->type) != m_spriteSequences.end())
+      if(m_spriteSequences.contains(m->type))
         BOOST_THROW_EXCEPTION(std::runtime_error("Duplicate type id"));
 
       m_spriteSequences[m->type] = std::move(m);
diff --git a/src/loader/file/level/tr4level.h b/src/loader/file/level/tr4level.h
index 24d881fe9..b5c574c25 100644
--- a/src/loader/file/level/tr4level.h
+++ b/src/loader/file/level/tr4level.h
@@ -9,7 +9,7 @@
 
 namespace loader::file::level
 {
-class TR4Level : public Level
+class TR4Level final : public Level
 {
 public:
   TR4Level(const Game gameVersion, io::SDLReader&& reader, std::filesystem::path filename)
diff --git a/src/loader/file/level/tr5level.cpp b/src/loader/file/level/tr5level.cpp
index bd6352d39..adfafea5f 100644
--- a/src/loader/file/level/tr5level.cpp
+++ b/src/loader/file/level/tr5level.cpp
@@ -24,15 +24,14 @@ namespace loader::file::level
 void TR5Level::loadFileData()
 {
   // Version
-  const uint32_t file_version = m_reader.readU32();
 
-  if(file_version != 0x00345254)
+  if(const uint32_t file_version = m_reader.readU32(); file_version != 0x00345254)
     BOOST_THROW_EXCEPTION(std::runtime_error("TR5 Level: Wrong level version"));
 
   const auto numRoomTextiles = m_reader.readU16();
   const auto numObjTextiles = m_reader.readU16();
   const auto numBumpTextiles = m_reader.readU16();
-  const auto numMiscTextiles = 3;
+  constexpr auto numMiscTextiles = 3;
   const auto numTextiles = numRoomTextiles + numObjTextiles + numBumpTextiles + numMiscTextiles;
 
   auto uncomp_size = m_reader.readU32();
@@ -144,7 +143,7 @@ void TR5Level::loadFileData()
     for(uint32_t i = 0; i < n; ++i)
     {
       auto m = SkeletalModelType::readTr5(m_reader);
-      if(m_animatedModels.find(m->type) != m_animatedModels.end())
+      if(m_animatedModels.contains(m->type))
         BOOST_THROW_EXCEPTION(std::runtime_error("Duplicate type id"));
 
       m_animatedModels[m->type] = std::move(m);
@@ -172,7 +171,7 @@ void TR5Level::loadFileData()
     for(uint32_t i = 0; i < n; ++i)
     {
       auto m = SpriteSequence::read(m_reader);
-      if(m_spriteSequences.find(m->type) != m_spriteSequences.end())
+      if(m_spriteSequences.contains(m->type))
         BOOST_THROW_EXCEPTION(std::runtime_error("Duplicate type id"));
 
       m_spriteSequences[m->type] = std::move(m);
diff --git a/src/loader/file/level/tr5level.h b/src/loader/file/level/tr5level.h
index 2efab8432..7f055ba65 100644
--- a/src/loader/file/level/tr5level.h
+++ b/src/loader/file/level/tr5level.h
@@ -9,7 +9,7 @@
 
 namespace loader::file::level
 {
-class TR5Level : public Level
+class TR5Level final : public Level
 {
 public:
   TR5Level(const Game gameVersion, io::SDLReader&& reader, std::filesystem::path filename)
diff --git a/src/loader/file/mesh.cpp b/src/loader/file/mesh.cpp
index 6386f14c6..a91f302c8 100644
--- a/src/loader/file/mesh.cpp
+++ b/src/loader/file/mesh.cpp
@@ -6,7 +6,7 @@
 #include "qs/quantity.h"
 
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace loader::file
 {
@@ -14,13 +14,12 @@ Mesh Mesh::readTr1(io::SDLReader& reader)
 {
   Mesh mesh{};
   mesh.collision_center = readCoordinates16(reader);
-  mesh.collision_radius = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI16())};
+  mesh.collision_radius = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI16())};
   mesh.flags = reader.readU16();
 
   reader.readVector(mesh.vertices, reader.readU16(), &io::readCoordinates16);
 
-  const auto num_normals = reader.readI16();
-  if(num_normals >= 0)
+  if(const auto num_normals = reader.readI16(); num_normals >= 0)
   {
     gsl_Assert(static_cast<size_t>(num_normals) == mesh.vertices.size());
     reader.readVector(mesh.normals, num_normals, &io::readCoordinates16);
@@ -43,12 +42,11 @@ Mesh Mesh::readTr4(io::SDLReader& reader)
 {
   Mesh mesh{};
   mesh.collision_center = readCoordinates16(reader);
-  mesh.collision_radius = core::Length{gsl::narrow_cast<core::Length::type>(reader.readI32())};
+  mesh.collision_radius = core::Length{gsl_lite::narrow_cast<core::Length::type>(reader.readI32())};
 
   reader.readVector(mesh.vertices, reader.readU16(), &io::readCoordinates16);
 
-  const auto num_normals = reader.readI16();
-  if(num_normals >= 0)
+  if(const auto num_normals = reader.readI16(); num_normals >= 0)
   {
     reader.readVector(mesh.normals, num_normals, &io::readCoordinates16);
   }
@@ -62,4 +60,4 @@ Mesh Mesh::readTr4(io::SDLReader& reader)
 
   return mesh;
 }
-} // namespace loader::file
+} // namespace loader::file
\ No newline at end of file
diff --git a/src/loader/file/meshes.cpp b/src/loader/file/meshes.cpp
index ee78ef808..c5e741045 100644
--- a/src/loader/file/meshes.cpp
+++ b/src/loader/file/meshes.cpp
@@ -8,7 +8,7 @@
 #include "util/helpers.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace loader::file
 {
@@ -18,13 +18,13 @@ RoomStaticMesh RoomStaticMesh::readTr1(io::SDLReader& reader)
   room_static_mesh.position = readCoordinates32(reader);
   room_static_mesh.rotation = core::auToAngle(reader.readI16());
   room_static_mesh.shade = core::Shade{reader.readI16()};
-  room_static_mesh.meshId = core::StaticMeshId::type(reader.readU16());
+  room_static_mesh.meshId = static_cast<core::StaticMeshId::type>(reader.readU16());
 
   // only in TR2
   room_static_mesh.intensity2 = room_static_mesh.shade.get();
 
   room_static_mesh.tint.b = room_static_mesh.tint.g = room_static_mesh.tint.r
-    = gsl::narrow_cast<float>(room_static_mesh.intensity2) / 16384.0f;
+    = gsl_lite::narrow_cast<float>(room_static_mesh.intensity2) / 16384.0f;
   room_static_mesh.tint.a = 1.0f;
   return room_static_mesh;
 }
@@ -36,15 +36,16 @@ RoomStaticMesh RoomStaticMesh::readTr2(io::SDLReader& reader)
   room_static_mesh.rotation = core::auToAngle(reader.readI16());
   room_static_mesh.shade = core::Shade{reader.readI16()};
   room_static_mesh.intensity2 = reader.readI16();
-  room_static_mesh.meshId = core::StaticMeshId::type(reader.readU16());
+  room_static_mesh.meshId = static_cast<core::StaticMeshId::type>(reader.readU16());
   // make consistent
   if(room_static_mesh.shade.get() >= 0)
-    room_static_mesh.shade = core::Shade{gsl::narrow<core::Shade::type>((8191 - room_static_mesh.shade.get()) * 4)};
+    room_static_mesh.shade
+      = core::Shade{gsl_lite::narrow<core::Shade::type>((8191 - room_static_mesh.shade.get()) * 4)};
   if(room_static_mesh.intensity2 >= 0)
     room_static_mesh.intensity2 = (int16_t{8191} - room_static_mesh.intensity2) * int16_t{4};
 
   room_static_mesh.tint.b = room_static_mesh.tint.g = room_static_mesh.tint.r
-    = gsl::narrow_cast<float>(room_static_mesh.intensity2) / 16384.0f;
+    = gsl_lite::narrow_cast<float>(room_static_mesh.intensity2) / 16384.0f;
   room_static_mesh.tint.a = 1.0f;
   return room_static_mesh;
 }
@@ -56,13 +57,13 @@ RoomStaticMesh RoomStaticMesh::readTr3(io::SDLReader& reader)
   room_static_mesh.rotation = core::auToAngle(reader.readI16());
   room_static_mesh.shade = core::Shade{reader.readI16()};
   room_static_mesh.intensity2 = reader.readI16();
-  room_static_mesh.meshId = core::StaticMeshId::type(reader.readU16());
+  room_static_mesh.meshId = static_cast<core::StaticMeshId::type>(reader.readU16());
   room_static_mesh.tint.r
-    = gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 0, 5)) / 62.0f;
+    = gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 0, 5)) / 62.0f;
   room_static_mesh.tint.g
-    = gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 5, 5)) / 62.0f;
+    = gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 5, 5)) / 62.0f;
   room_static_mesh.tint.b
-    = gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 10, 5)) / 62.0f;
+    = gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 10, 5)) / 62.0f;
   room_static_mesh.tint.a = 1.0f;
   return room_static_mesh;
 }
@@ -74,14 +75,14 @@ RoomStaticMesh RoomStaticMesh::readTr4(io::SDLReader& reader)
   room_static_mesh.rotation = core::auToAngle(reader.readI16());
   room_static_mesh.shade = core::Shade{reader.readI16()};
   room_static_mesh.intensity2 = reader.readI16();
-  room_static_mesh.meshId = core::StaticMeshId::type(reader.readU16());
+  room_static_mesh.meshId = static_cast<core::StaticMeshId::type>(reader.readU16());
   room_static_mesh.tint.r
-    = gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 0, 5)) / 31.0f;
+    = gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 0, 5)) / 31.0f;
   room_static_mesh.tint.g
-    = gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 5, 5)) / 31.0f;
+    = gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 5, 5)) / 31.0f;
   room_static_mesh.tint.b
-    = gsl::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 10, 5)) / 31.0f;
+    = gsl_lite::narrow_cast<float>(util::bits(static_cast<uint16_t>(room_static_mesh.shade.get()), 10, 5)) / 31.0f;
   room_static_mesh.tint.a = 1.0f;
   return room_static_mesh;
 }
-} // namespace loader::file
+} // namespace loader::file
\ No newline at end of file
diff --git a/src/loader/file/primitives.h b/src/loader/file/primitives.h
index aba38efe5..ecdd5c41b 100644
--- a/src/loader/file/primitives.h
+++ b/src/loader/file/primitives.h
@@ -23,12 +23,12 @@ struct Triangle
 {
   //! Vertex buffer indices
   std::array<VertexIndex, 3> vertices{};
-  core::TextureTileId tileId{uint16_t(0)}; /**< \brief object-texture index or color index.
+  core::TextureTileId tileId{static_cast<uint16_t>(0)}; /**< \brief object-texture index or color index.
                              * If the triangle is textured, then this is an index into the object-texture list.
                              * If it's not textured, then the low 8 bit contain the index into the 256 color palette
                              * and from TR2 on the high 8 bit contain the index into the 16 bit palette.
                              */
-  uint16_t lighting = 0;                   /**< \brief transparency flag & strength of the highlight (TR4-TR5).
+  uint16_t lighting = 0; /**< \brief transparency flag & strength of the highlight (TR4-TR5).
                              * bit0 if set, then alpha channel = intensity (see attribute in tr2_object_texture).<br>
                              * bit1-7 is the strength of the highlight.
                              */
@@ -51,12 +51,12 @@ struct QuadFace
 {
   //! Vertex buffer indices
   std::array<VertexIndex, 4> vertices{};
-  core::TextureTileId tileId{uint16_t(0)}; /**< \brief object-texture index or color index.
+  core::TextureTileId tileId{static_cast<uint16_t>(0)}; /**< \brief object-texture index or color index.
                              * If the rectangle is textured, then this is an index into the object-texture list.
                              * If it's not textured, then the low 8 bit contain the index into the 256 color palette
                              * and from TR2 on the high 8 bit contain the index into the 16 bit palette.
                              */
-  uint16_t lighting = 0;                   /**< \brief transparency flag & strength of the highlight (TR4-TR5).
+  uint16_t lighting = 0; /**< \brief transparency flag & strength of the highlight (TR4-TR5).
                              *
                              * In TR4, objects can exhibit some kind of light reflection when seen from some particular angles.
                              * - bit0 if set, then alpha channel = intensity (see attribute in tr2_object_texture).
diff --git a/src/loader/file/texture.cpp b/src/loader/file/texture.cpp
index d6c075c1d..48b0b51ab 100644
--- a/src/loader/file/texture.cpp
+++ b/src/loader/file/texture.cpp
@@ -39,9 +39,9 @@ std::unique_ptr<DWordTexture> DWordTexture::read(io::SDLReader& reader)
 std::unique_ptr<ByteTexture> ByteTexture::read(io::SDLReader& reader)
 {
   auto textile = std::make_unique<ByteTexture>();
-  reader.readBytes(
-    reinterpret_cast<uint8_t*>(&textile->pixels[0][0]), //NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
-    sizeof(textile->pixels));
+  reader.readBytes(reinterpret_cast<uint8_t*>(&textile->pixels[0][0]),
+                   //NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
+                   sizeof(textile->pixels));
   return textile;
 }
 
@@ -51,12 +51,11 @@ std::unique_ptr<WordTexture> WordTexture::read(io::SDLReader& reader)
 
   for(auto& row : texture->pixels)
   {
-    std::generate(row.begin(),
-                  row.end(),
-                  [&reader]()
-                  {
-                    return reader.readU16();
-                  });
+    std::ranges::generate(row,
+                          [&reader]
+                          {
+                            return reader.readU16();
+                          });
   }
 
   return texture;
@@ -81,12 +80,11 @@ std::unique_ptr<TextureTile> TextureTile::readTr1(io::SDLReader& reader)
   if((tile->textureKey.atlasIdAndFlag & (1u << 15u)) != 0)
     BOOST_LOG_TRIVIAL(warning) << "TR1 Object Texture: tileAndFlag is flagged";
 
-  std::generate(tile->uvCoordinates.begin(),
-                tile->uvCoordinates.end(),
-                [&reader]()
-                {
-                  return UVCoordinates::read(reader);
-                });
+  std::ranges::generate(tile->uvCoordinates,
+                        [&reader]
+                        {
+                          return UVCoordinates::read(reader);
+                        });
   return tile;
 }
 
@@ -99,12 +97,11 @@ std::unique_ptr<TextureTile> TextureTile::readTr4(io::SDLReader& reader)
     BOOST_LOG_TRIVIAL(warning) << "TR4 Object Texture: tileAndFlag > 128";
 
   tile->textureKey.flags = reader.readU16();
-  std::generate(tile->uvCoordinates.begin(),
-                tile->uvCoordinates.end(),
-                [&reader]()
-                {
-                  return UVCoordinates::read(reader);
-                });
+  std::ranges::generate(tile->uvCoordinates,
+                        [&reader]
+                        {
+                          return UVCoordinates::read(reader);
+                        });
   tile->unknown1 = reader.readU32();
   tile->unknown2 = reader.readU32();
   tile->x_size = reader.readU32();
diff --git a/src/loader/file/texture.h b/src/loader/file/texture.h
index a5f134e54..f17a763ee 100644
--- a/src/loader/file/texture.h
+++ b/src/loader/file/texture.h
@@ -9,7 +9,7 @@
 #include <gl/image.h>
 #include <gl/pixel.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <limits>
 #include <memory>
 #include <string>
@@ -100,8 +100,8 @@ struct UVCoordinates
   {
     BOOST_ASSERT(uv.x >= 0 && uv.x < 1);
     BOOST_ASSERT(uv.y >= 0 && uv.y < 1);
-    x = Component{gsl::narrow_cast<Component::type>(uv.x * ComponentScale)};
-    y = Component{gsl::narrow_cast<Component::type>(uv.y * ComponentScale)};
+    x = Component{gsl_lite::narrow_cast<Component::type>(uv.x * ComponentScale)};
+    y = Component{gsl_lite::narrow_cast<Component::type>(uv.y * ComponentScale)};
   }
 
   [[nodiscard]] constexpr bool isUnset() const
@@ -177,4 +177,4 @@ struct TextureTile
 
   static std::unique_ptr<TextureTile> readTr5(io::SDLReader& reader);
 };
-} // namespace loader::file
+} // namespace loader::file
\ No newline at end of file
diff --git a/src/loader/py_module.h b/src/loader/py_module.h
index a0cffd9b4..21e9a9d8c 100644
--- a/src/loader/py_module.h
+++ b/src/loader/py_module.h
@@ -11,6 +11,6 @@ inline void initLoaderModule(pybind11::module& m)
   namespace py = pybind11;
 
   auto fileModule = m.def_submodule("file");
-  loader::file::initFileModule(fileModule);
+  file::initFileModule(fileModule);
 }
 } // namespace loader
diff --git a/src/loader/trx/trx.cpp b/src/loader/trx/trx.cpp
index 7bb7a7322..5583c6f7c 100644
--- a/src/loader/trx/trx.cpp
+++ b/src/loader/trx/trx.cpp
@@ -17,7 +17,7 @@
 #include <filesystem>
 #include <fstream>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <map>
 #include <regex>
 #include <stdexcept>
@@ -168,12 +168,11 @@ void Equiv::resolve(const std::filesystem::path& root,
 
   BOOST_LOG_TRIVIAL(info) << "Resolving " << m_equivalentSets.size() << " equiv sets...";
 
-  auto resolved = std::count_if(m_equivalentSets.begin(),
-                                m_equivalentSets.end(),
-                                [](const EquivalenceSet& set)
-                                {
-                                  return set.isResolved();
-                                });
+  auto resolved = std::ranges::count_if(m_equivalentSets,
+                                        [](const EquivalenceSet& set)
+                                        {
+                                          return set.isResolved();
+                                        });
 
   statusCallback(_("Glidos - Resolving maps (%1%%%)", resolved * 100 / m_equivalentSets.size()));
 
@@ -186,8 +185,7 @@ void Equiv::resolve(const std::filesystem::path& root,
     std::filesystem::path partFile;
     for(const auto& part : set.getParts())
     {
-      auto it = filesByPart.find(part);
-      if(it != filesByPart.end())
+      if(auto it = filesByPart.find(part); it != filesByPart.end())
       {
         if(!partFile.empty() && partFile != it->second)
         {
@@ -283,7 +281,7 @@ PathMap::PathMap(const std::filesystem::path& baseTxtName,
 
       gsl_Assert(parts[0].size() == 32);
 
-      if(dirByTextureId.find(parts[0]) != dirByTextureId.end())
+      if(dirByTextureId.contains(parts[0]))
       {
         BOOST_THROW_EXCEPTION(std::runtime_error("Texture path mapping already registered"));
       }
@@ -418,4 +416,4 @@ void Glidos::insertInternalMapping(const std::string& textureId, const Rectangle
 {
   m_filesByPart.emplace(TexturePart{textureId, tile}, std::filesystem::path{});
 }
-} // namespace loader::trx
+} // namespace loader::trx
\ No newline at end of file
diff --git a/src/loader/trx/trx.h b/src/loader/trx/trx.h
index 07bfc75dd..57e3a6b85 100644
--- a/src/loader/trx/trx.h
+++ b/src/loader/trx/trx.h
@@ -63,7 +63,7 @@ class Rectangle
     return m_xy1.y - m_xy0.y;
   }
 
-  [[nodiscard]] bool contains(int x, int y) const
+  [[nodiscard]] bool contains(const int x, const int y) const
   {
     return x >= m_xy0.x && x < m_xy1.x && y >= m_xy0.y && y < m_xy1.y;
   }
diff --git a/src/menu/applyitemtransformmenustate.cpp b/src/menu/applyitemtransformmenustate.cpp
index d80f294e0..da03e6646 100644
--- a/src/menu/applyitemtransformmenustate.cpp
+++ b/src/menu/applyitemtransformmenustate.cpp
@@ -14,10 +14,9 @@ namespace menu
 {
 class MenuState;
 
-void ApplyItemTransformMenuState::handleObject(ui::Ui& /*ui*/,
-                                               engine::world::World& /*world*/,
-                                               MenuDisplay& display,
-                                               MenuObject& object)
+void ApplyItemTransformMenuState::handleObjectTick(engine::world::World& /*world*/,
+                                                   MenuDisplay& display,
+                                                   MenuObject& object)
 {
   if(&object != &display.getCurrentRing().getSelectedObject())
   {
@@ -43,15 +42,18 @@ void ApplyItemTransformMenuState::handleObject(ui::Ui& /*ui*/,
   }
 }
 
-std::unique_ptr<MenuState>
-  ApplyItemTransformMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+std::unique_ptr<MenuState> ApplyItemTransformMenuState::tick(engine::world::World& /*world*/, MenuDisplay& /*display*/)
 {
   if(m_duration != Duration)
   {
-    m_duration += 1_frame;
+    m_duration += 1_tick;
     return nullptr;
   }
 
   return create<SelectedMenuState>();
 }
+
+void ApplyItemTransformMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
 } // namespace menu
diff --git a/src/menu/applyitemtransformmenustate.h b/src/menu/applyitemtransformmenustate.h
index 5bd11e92f..523af5816 100644
--- a/src/menu/applyitemtransformmenustate.h
+++ b/src/menu/applyitemtransformmenustate.h
@@ -24,9 +24,8 @@ struct MenuRingTransform;
 
 class ApplyItemTransformMenuState : public MenuState
 {
-private:
-  static constexpr core::Frame Duration = 16_frame / 2;
-  core::Frame m_duration{0_frame};
+  static constexpr core::Tick Duration = 16_tick / 2;
+  core::Tick m_duration{0_tick};
 
 public:
   explicit ApplyItemTransformMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform)
@@ -34,7 +33,8 @@ class ApplyItemTransformMenuState : public MenuState
   {
   }
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/audiosettingsmenustate.cpp b/src/menu/audiosettingsmenustate.cpp
index a9e8e4814..3bc7dcb0a 100644
--- a/src/menu/audiosettingsmenustate.cpp
+++ b/src/menu/audiosettingsmenustate.cpp
@@ -24,7 +24,7 @@
 #include <boost/throw_exception.hpp>
 #include <glm/fwd.hpp>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <stdexcept>
@@ -66,8 +66,7 @@ AudioSettingsMenuState::AudioSettingsMenuState(const std::shared_ptr<MenuRingTra
   m_container->fitToContent();
 }
 
-std::unique_ptr<MenuState>
-  AudioSettingsMenuState::onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+std::unique_ptr<MenuState> AudioSettingsMenuState::tick(engine::world::World& world, MenuDisplay& /*display*/)
 {
   static constexpr float Stepping = 0.1f;
   auto& audioSettings = world.getEngine().getEngineConfig()->audioSettings;
@@ -81,14 +80,12 @@ std::unique_ptr<MenuState>
 
   if(inputHandler.hasDebouncedAction(hid::Action::MenuUp))
   {
-    auto [ignored, y] = m_grid->getSelected(); // lgtm [cpp/unused-local-variable]
-    if(y > 0)
+    if(auto [ignored, y] = m_grid->getSelected(); y > 0)
       m_grid->setSelected({0, y - 1});
   }
   if(inputHandler.hasDebouncedAction(hid::Action::MenuDown))
   {
-    auto [ignored, y] = m_grid->getSelected(); // lgtm [cpp/unused-local-variable]
-    if(y < std::get<1>(m_grid->getExtents()) - 1)
+    if(auto [ignored, y] = m_grid->getSelected(); y < std::get<1>(m_grid->getExtents()) - 1)
       m_grid->setSelected({0, y + 1});
   }
 
@@ -121,7 +118,7 @@ std::unique_ptr<MenuState>
   audioSettings.musicVolume = m_musicVolume->getValue();
   audioSettings.sfxVolume = m_sfxVolume->getValue();
 
-  world.getPresenter().getSoundEngine()->setListenerGain(audioSettings.globalVolume);
+  world.getEngine().getPresenter().getSoundEngine()->setListenerGain(audioSettings.globalVolume);
   world.getAudioEngine().setMusicGain(audioSettings.musicVolume);
   world.getAudioEngine().setSfxGain(audioSettings.sfxVolume);
 
@@ -130,12 +127,15 @@ std::unique_ptr<MenuState>
     world.getAudioEngine().playSoundEffect(engine::TR1SoundEffect::MenuGamePageTurn, nullptr);
   }
 
-  m_grid->update(true);
+  m_grid->tick(true);
 
+  return nullptr;
+}
+
+void AudioSettingsMenuState::constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+{
   m_container->setPosition(
     {(ui.getSize().x - m_container->getSize().x) / 2, ui.getSize().y - m_container->getSize().y - 90});
-  m_container->draw(ui, world.getPresenter());
-
-  return nullptr;
+  m_container->draw(ui, world.getEngine().getPresenter());
 }
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/audiosettingsmenustate.h b/src/menu/audiosettingsmenustate.h
index 9d057ae3b..d1d35fd7b 100644
--- a/src/menu/audiosettingsmenustate.h
+++ b/src/menu/audiosettingsmenustate.h
@@ -28,9 +28,8 @@ namespace menu
 struct MenuDisplay;
 struct MenuRingTransform;
 
-class AudioSettingsMenuState : public SelectedMenuState
+class AudioSettingsMenuState final : public SelectedMenuState
 {
-private:
   std::unique_ptr<MenuState> m_previous;
   gslu::nn_shared<ui::widgets::GridBox> m_grid;
   gslu::nn_shared<ui::widgets::GroupBox> m_container;
@@ -41,6 +40,7 @@ class AudioSettingsMenuState : public SelectedMenuState
 public:
   explicit AudioSettingsMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
                                   std::unique_ptr<MenuState> previous);
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/closepassportmenustate.cpp b/src/menu/closepassportmenustate.cpp
index 26010efed..b6fed3682 100644
--- a/src/menu/closepassportmenustate.cpp
+++ b/src/menu/closepassportmenustate.cpp
@@ -10,7 +10,7 @@
 #include "resetitemtransformmenustate.h"
 #include "setitemtypemenustate.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <utility>
 
@@ -25,30 +25,31 @@ ClosePassportMenuState::ClosePassportMenuState(const std::shared_ptr<MenuRingTra
   gsl_Expects(passport.type == engine::TR1ItemId::PassportOpening);
 
   const auto localFrame = passport.goalFrame - passport.openFrame;
-  auto page = localFrame / PassportMenuState::FramesPerPage;
-  if(page == PassportMenuState::ExitGamePage)
+  if(const auto page = localFrame / PassportMenuState::FramesPerPage; page == PassportMenuState::ExitGamePage)
   {
-    passport.goalFrame = passport.lastMeshAnimFrame - 1_frame;
-    passport.animDirection = 1_frame;
+    passport.goalFrame = passport.lastMeshAnimFrame - 1_mframe;
+    passport.animDirection = 1_mframe;
   }
   else
   {
-    passport.goalFrame = 0_frame;
-    passport.animDirection = -1_frame;
+    passport.goalFrame = 0_mframe;
+    passport.animDirection = -1_mframe;
   }
 }
 
-std::unique_ptr<MenuState>
-  ClosePassportMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+std::unique_ptr<MenuState> ClosePassportMenuState::tick(engine::world::World& /*world*/, MenuDisplay& /*display*/)
 {
   return create<FinishItemAnimationMenuState>(create<SetItemTypeMenuState>(
     engine::TR1ItemId::PassportClosed, create<ResetItemTransformMenuState>(std::move(m_next))));
 }
 
-void ClosePassportMenuState::handleObject(ui::Ui& /*ui*/,
-                                          engine::world::World& /*world*/,
-                                          MenuDisplay& /*display*/,
-                                          MenuObject& /*object*/)
+void ClosePassportMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
 {
 }
-} // namespace menu
+
+void ClosePassportMenuState::handleObjectTick(engine::world::World& /*world*/,
+                                              MenuDisplay& /*display*/,
+                                              MenuObject& /*object*/)
+{
+}
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/closepassportmenustate.h b/src/menu/closepassportmenustate.h
index a02cd1313..db0f65ee1 100644
--- a/src/menu/closepassportmenustate.h
+++ b/src/menu/closepassportmenustate.h
@@ -20,9 +20,8 @@ struct MenuDisplay;
 struct MenuObject;
 struct MenuRingTransform;
 
-class ClosePassportMenuState : public MenuState
+class ClosePassportMenuState final : public MenuState
 {
-private:
   std::unique_ptr<MenuState> m_next;
 
 public:
@@ -30,7 +29,8 @@ class ClosePassportMenuState : public MenuState
                                   MenuObject& passport,
                                   std::unique_ptr<MenuState>&& next);
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/compassmenustate.cpp b/src/menu/compassmenustate.cpp
index 5761e6254..c96280b94 100644
--- a/src/menu/compassmenustate.cpp
+++ b/src/menu/compassmenustate.cpp
@@ -13,7 +13,7 @@
 #include "selectedmenustate.h"
 #include "ui/detailedlevelstats.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <utility>
 
@@ -24,23 +24,25 @@ CompassMenuState::CompassMenuState(const std::shared_ptr<MenuRingTransform>& rin
                                    engine::world::World& world)
     : SelectedMenuState{ringTransform}
     , m_previous{std::move(previous)}
-    , m_stats{gsl::make_shared<ui::DetailedLevelStats>(world)}
+    , m_stats{gsl_lite::make_shared<ui::DetailedLevelStats>(world)}
 {
 }
 
-std::unique_ptr<MenuState> CompassMenuState::onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+std::unique_ptr<MenuState> CompassMenuState::tick(engine::world::World& world, MenuDisplay& display)
 {
-  const auto& inputHandler = world.getEngine().getPresenter().getInputHandler();
-  if(inputHandler.hasDebouncedAction(hid::Action::Return))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
   {
     auto& object = display.getCurrentRing().getSelectedObject();
-    object.animDirection = -1_frame;
-    object.goalFrame = 0_frame;
+    object.animDirection = -1_mframe;
+    object.goalFrame = 0_mframe;
     return std::move(m_previous);
   }
 
-  m_stats->draw(ui, world.getPresenter(), true);
-
   return nullptr;
 }
-} // namespace menu
+
+void CompassMenuState::constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+{
+  m_stats->draw(ui, world.getEngine().getPresenter(), true);
+}
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/compassmenustate.h b/src/menu/compassmenustate.h
index 2da205db0..bcefa3ca5 100644
--- a/src/menu/compassmenustate.h
+++ b/src/menu/compassmenustate.h
@@ -24,7 +24,6 @@ struct MenuDisplay;
 
 class CompassMenuState : public SelectedMenuState
 {
-private:
   std::unique_ptr<MenuState> m_previous;
   gslu::nn_shared<ui::DetailedLevelStats> m_stats;
 
@@ -32,6 +31,7 @@ class CompassMenuState : public SelectedMenuState
   explicit CompassMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
                             std::unique_ptr<MenuState> previous,
                             engine::world::World& world);
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/controlsmenustate.cpp b/src/menu/controlsmenustate.cpp
index 02472c52a..4ffdd9012 100644
--- a/src/menu/controlsmenustate.cpp
+++ b/src/menu/controlsmenustate.cpp
@@ -27,7 +27,7 @@
 #include <chrono>
 #include <functional>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <initializer_list>
 #include <map>
 #include <memory>
@@ -71,10 +71,10 @@ std::function<std::shared_ptr<ui::widgets::Widget>(
 {
   return [controllerLayoutName, &world](const engine::InputMappingConfig& gameMappingConfig,
                                         const engine::InputMappingConfig& menuMappingConfig,
-                                        hid::Action action) -> std::shared_ptr<ui::widgets::Widget>
+                                        const hid::Action action) -> std::shared_ptr<ui::widgets::Widget>
   {
-    auto gameKeys = getKeys(gameMappingConfig, engine::NamedAction{action});
-    auto menuKeys = getKeys(menuMappingConfig, engine::NamedAction{action});
+    const auto gameKeys = getKeys(gameMappingConfig, engine::NamedAction{action});
+    const auto menuKeys = getKeys(menuMappingConfig, engine::NamedAction{action});
 
     auto keys = gameKeys;
     keys.insert(keys.end(), menuKeys.cbegin(), menuKeys.cend());
@@ -130,14 +130,18 @@ std::function<std::shared_ptr<ui::widgets::Widget>(
       case hid::GlfwAxis::LeftX:
         [[fallthrough]];
       case hid::GlfwAxis::RightX:
-        axisName = makeDirName(/* translators: TR charcmap encoding */ pgettext("GamepadAxis", "Left"),
-                               /* translators: TR charcmap encoding */ pgettext("GamepadAxis", "Right"));
+        axisName = makeDirName(
+          /* translators: TR charcmap encoding */ pgettext("GamepadAxis", "Left"),
+          /* translators: TR charcmap encoding */
+          pgettext("GamepadAxis", "Right"));
         break;
       case hid::GlfwAxis::LeftY:
         [[fallthrough]];
       case hid::GlfwAxis::RightY:
-        axisName = makeDirName(/* translators: TR charcmap encoding */ pgettext("GamepadAxis", "Up"),
-                               /* translators: TR charcmap encoding */ pgettext("GamepadAxis", "Down"));
+        axisName = makeDirName(
+          /* translators: TR charcmap encoding */ pgettext("GamepadAxis", "Up"),
+          /* translators: TR charcmap encoding */
+          pgettext("GamepadAxis", "Down"));
         break;
       case hid::GlfwAxis::LeftTrigger:
         [[fallthrough]];
@@ -147,7 +151,7 @@ std::function<std::shared_ptr<ui::widgets::Widget>(
 
       auto grid = std::make_shared<ui::widgets::GridBox>(glm::ivec2{0, 0});
       grid->setExtents(2, 1);
-      auto s = std::make_shared<ui::widgets::Sprite>(it->second);
+      const auto s = std::make_shared<ui::widgets::Sprite>(it->second);
       s->fitToContent();
       grid->set(0, 0, s);
       grid->set(1, 0, std::make_shared<ui::widgets::Label>(axisName));
@@ -167,7 +171,7 @@ ControlsMenuState::ControlsMenuState(const std::shared_ptr<MenuRingTransform>& r
                                      const engine::world::World& world)
     : SelectedMenuState{ringTransform}
     , m_previous{std::move(previous)}
-    , m_editing{world.getPresenter().getInputHandler().getMappings()}
+    , m_editing{world.getEngine().getPresenter().getInputHandler().getMappings()}
     , m_layout{std::make_shared<ui::widgets::GridBox>()}
     , m_controls{std::make_shared<ControlsWidget>(m_editing.at(0))}
     , m_resetModernKey{hid::GlfwKey::Backspace, 5}
@@ -179,7 +183,8 @@ ControlsMenuState::ControlsMenuState(const std::shared_ptr<MenuRingTransform>& r
                                  /* translators: TR charmap encoding */ _("No"),
                                  /* translators: TR charmap encoding */ _("Return")})}
     , m_error{std::make_shared<ui::widgets::SelectionBox>(
-        ui::breakLines(/* translators: TR charmap encoding */ _("Ensure your menu mapping is fully configured."), 500),
+        ui::breakLines(
+          /* translators: TR charmap encoding */ _("Ensure your menu mapping is fully configured."), 500),
         std::vector<std::string>{/* translators: TR charmap encoding */ _("OK"),
                                  /* translators: TR charmap encoding */ _("Discard changes")})}
 {
@@ -224,9 +229,10 @@ ControlsMenuState::ControlsMenuState(const std::shared_ptr<MenuRingTransform>& r
   m_error->fitToContent();
 }
 
-std::unique_ptr<MenuState> ControlsMenuState::onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+std::unique_ptr<MenuState> ControlsMenuState::tick(engine::world::World& world, MenuDisplay& /*display*/)
 {
-  if(m_mode == Mode::Display && world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
+  if(m_mode == Mode::Display
+     && world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
   {
     if(m_editing == world.getEngine().getEngineConfig()->inputMappings)
     {
@@ -279,49 +285,69 @@ std::unique_ptr<MenuState> ControlsMenuState::onFrame(ui::Ui& ui, engine::world:
     break;
   }
 
+  switch(m_mode)
+  {
+  case Mode::Display:
+    m_layout->tick(true);
+    break;
+  case Mode::ChangeKey:
+    m_layout->tick(std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::system_clock::now())
+                       .time_since_epoch()
+                       .count()
+                     % BlinkPeriod.count()
+                   < BlinkPeriod.count() / 2);
+    break;
+  case Mode::ConfirmApply:
+    m_confirm->tick(true);
+    break;
+  case Mode::Error:
+    m_error->tick(true);
+    break;
+  case Mode::Apply:
+    [[fallthrough]];
+  case Mode::Discard:
+    break;
+  }
+
+  return nullptr;
+}
+
+void ControlsMenuState::constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+{
   m_controls->fitToContent();
   m_layout->fitToContent();
 
   m_layout->setPosition({(ui.getSize().x - m_layout->getSize().x) / 2, ui.getSize().y - 90 - m_layout->getSize().y});
+
   switch(m_mode)
   {
   case Mode::Display:
-    m_layout->update(true);
-    m_layout->draw(ui, world.getPresenter());
+    m_layout->draw(ui, world.getEngine().getPresenter());
     break;
   case Mode::ChangeKey:
-    m_layout->update(std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::system_clock::now())
-                         .time_since_epoch()
-                         .count()
-                       % BlinkPeriod.count()
-                     < BlinkPeriod.count() / 2);
-    m_layout->draw(ui, world.getPresenter());
+    m_layout->draw(ui, world.getEngine().getPresenter());
     break;
   case Mode::ConfirmApply:
-    m_confirm->update(true);
     m_confirm->setPosition(
       {(ui.getSize().x - m_confirm->getSize().x) / 2, ui.getSize().y - 200 - m_confirm->getSize().y});
-    m_layout->draw(ui, world.getPresenter());
-    m_confirm->draw(ui, world.getPresenter());
+    m_layout->draw(ui, world.getEngine().getPresenter());
+    m_confirm->draw(ui, world.getEngine().getPresenter());
     break;
   case Mode::Error:
-    m_error->update(true);
     m_error->setPosition({(ui.getSize().x - m_error->getSize().x) / 2, ui.getSize().y - 200 - m_error->getSize().y});
-    m_layout->draw(ui, world.getPresenter());
-    m_error->draw(ui, world.getPresenter());
+    m_layout->draw(ui, world.getEngine().getPresenter());
+    m_error->draw(ui, world.getEngine().getPresenter());
     break;
   case Mode::Apply:
     [[fallthrough]];
   case Mode::Discard:
     break;
   }
-
-  return nullptr;
 }
 
 void ControlsMenuState::handleDisplayInput(engine::world::World& world)
 {
-  if(m_resetModernKey.update(world.getPresenter().getInputHandler()))
+  if(m_resetModernKey.update(world.getEngine().getPresenter().getInputHandler()))
   {
     world.getEngine().getEngineConfig()->resetInputMappings(true);
     m_editingIndex = 0;
@@ -331,7 +357,7 @@ void ControlsMenuState::handleDisplayInput(engine::world::World& world)
     m_controls->updateBindings(editing, getButtonFactory(world, editing.controllerType));
   }
 
-  if(m_resetClassicKey.update(world.getPresenter().getInputHandler()))
+  if(m_resetClassicKey.update(world.getEngine().getPresenter().getInputHandler()))
   {
     world.getEngine().getEngineConfig()->resetInputMappings(false);
     m_editingIndex = 0;
@@ -341,17 +367,17 @@ void ControlsMenuState::handleDisplayInput(engine::world::World& world)
     m_controls->updateBindings(editing, getButtonFactory(world, editing.controllerType));
   }
 
-  if(m_deleteKey.update(world.getPresenter().getInputHandler()))
+  if(m_deleteKey.update(world.getEngine().getPresenter().getInputHandler()))
   {
     auto& editing = m_editing.at(m_editingIndex);
     auto& inputMappings = m_controls->isMenuControlsSelected() ? editing.menuMappings : editing.gameMappings;
-    auto inputs = getKeys(inputMappings, engine::NamedAction{m_controls->getCurrentAction()});
-    for(auto input : inputs)
+    for(const auto inputs = getKeys(inputMappings, engine::NamedAction{m_controls->getCurrentAction()});
+        auto input : inputs)
       inputMappings.erase(input);
     m_controls->updateBindings(editing, getButtonFactory(world, editing.controllerType));
   }
 
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(PrevProfileAction))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(PrevProfileAction))
   {
     if(m_editingIndex == 0)
       m_editingIndex = m_editing.size() - 1;
@@ -361,7 +387,7 @@ void ControlsMenuState::handleDisplayInput(engine::world::World& world)
     m_controls->updateBindings(editing, getButtonFactory(world, editing.controllerType));
   }
 
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(NextProfileAction))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(NextProfileAction))
   {
     if(m_editingIndex == m_editing.size() - 1)
       m_editingIndex = 0;
@@ -371,7 +397,7 @@ void ControlsMenuState::handleDisplayInput(engine::world::World& world)
     m_controls->updateBindings(editing, getButtonFactory(world, editing.controllerType));
   }
 
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(ChangeControllerTypeAction))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(ChangeControllerTypeAction))
   {
     auto& layouts = world.getWorldGeometry().getControllerLayouts();
     auto& editing = m_editing.at(m_editingIndex);
@@ -385,29 +411,29 @@ void ControlsMenuState::handleDisplayInput(engine::world::World& world)
     m_controls->updateBindings(editing, getButtonFactory(world, editing.controllerType));
   }
 
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuDown))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuDown))
   {
     m_controls->nextRow();
   }
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuUp))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuUp))
   {
     m_controls->prevRow();
   }
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuRight))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuRight))
   {
     m_controls->nextColumn();
   }
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuLeft))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuLeft))
   {
     m_controls->prevColumn();
   }
 
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(EditAction))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(EditAction))
   {
     m_mode = Mode::ChangeKey;
-    (void)world.getPresenter().getInputHandler().takeRecentlyPressedKey();
-    (void)world.getPresenter().getInputHandler().takeRecentlyPressedButton();
-    (void)world.getPresenter().getInputHandler().takeRecentlyPressedAxis();
+    (void)world.getEngine().getPresenter().getInputHandler().takeRecentlyPressedKey();
+    (void)world.getEngine().getPresenter().getInputHandler().takeRecentlyPressedButton();
+    (void)world.getEngine().getPresenter().getInputHandler().takeRecentlyPressedAxis();
   }
 }
 
@@ -417,8 +443,8 @@ void ControlsMenuState::handleChangeKeyInput(engine::world::World& world)
   {
     // it's fine to assign the same input to the same action in different profiles;
     // otherwise, remove the mapped input from all profiles before assigning it to the new action
-    auto mappingGroup = m_controls->isMenuControlsSelected() ? &engine::NamedInputMappingConfig::menuMappings
-                                                             : &engine::NamedInputMappingConfig::gameMappings;
+    const auto mappingGroup = m_controls->isMenuControlsSelected() ? &engine::NamedInputMappingConfig::menuMappings
+                                                                   : &engine::NamedInputMappingConfig::gameMappings;
 
     for(auto& mapping : m_editing)
     {
@@ -426,23 +452,23 @@ void ControlsMenuState::handleChangeKeyInput(engine::world::World& world)
     }
 
     auto& mapping = m_editing.at(m_editingIndex);
-    auto boundInputs = getKeys((mapping.*mappingGroup), engine::NamedAction{m_controls->getCurrentAction()});
-    for(auto boundInput : boundInputs)
+    for(const auto boundInputs = getKeys((mapping.*mappingGroup), engine::NamedAction{m_controls->getCurrentAction()});
+        auto boundInput : boundInputs)
       (mapping.*mappingGroup).erase(boundInput);
     (mapping.*mappingGroup)[newInput] = m_controls->getCurrentAction();
     m_mode = Mode::Display;
     m_controls->updateBindings(mapping, getButtonFactory(world, mapping.controllerType));
   };
 
-  if(const auto newKey = world.getPresenter().getInputHandler().takeRecentlyPressedKey())
+  if(const auto newKey = world.getEngine().getPresenter().getInputHandler().takeRecentlyPressedKey())
   {
     setInput(*newKey);
   }
-  else if(const auto newButton = world.getPresenter().getInputHandler().takeRecentlyPressedButton())
+  else if(const auto newButton = world.getEngine().getPresenter().getInputHandler().takeRecentlyPressedButton())
   {
     setInput(*newButton);
   }
-  else if(const auto newAxis = world.getPresenter().getInputHandler().takeRecentlyPressedAxis())
+  else if(const auto newAxis = world.getEngine().getPresenter().getInputHandler().takeRecentlyPressedAxis())
   {
     setInput(*newAxis);
   }
@@ -450,16 +476,17 @@ void ControlsMenuState::handleChangeKeyInput(engine::world::World& world)
 
 void ControlsMenuState::handleConfirmInput(engine::world::World& world)
 {
-  if(world.getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(hid::AxisMovement::Backward))
+  if(world.getEngine().getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
+       hid::AxisMovement::Backward))
   {
     m_confirm->next();
   }
-  else if(world.getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
+  else if(world.getEngine().getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
             hid::AxisMovement::Forward))
   {
     m_confirm->prev();
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     switch(m_confirm->getSelected())
     {
@@ -480,16 +507,17 @@ void ControlsMenuState::handleConfirmInput(engine::world::World& world)
 
 void ControlsMenuState::handleErrorInput(engine::world::World& world)
 {
-  if(world.getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(hid::AxisMovement::Backward))
+  if(world.getEngine().getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
+       hid::AxisMovement::Backward))
   {
     m_error->next();
   }
-  else if(world.getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
+  else if(world.getEngine().getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
             hid::AxisMovement::Forward))
   {
     m_error->prev();
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     switch(m_error->getSelected())
     {
@@ -504,4 +532,4 @@ void ControlsMenuState::handleErrorInput(engine::world::World& world)
     }
   }
 }
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/controlsmenustate.h b/src/menu/controlsmenustate.h
index 567f9cce4..4b57bee86 100644
--- a/src/menu/controlsmenustate.h
+++ b/src/menu/controlsmenustate.h
@@ -34,7 +34,6 @@ struct MenuRingTransform;
 
 class ControlsMenuState : public SelectedMenuState
 {
-private:
   enum class Mode : uint8_t
   {
     Display,
@@ -61,7 +60,7 @@ class ControlsMenuState : public SelectedMenuState
   Mode m_mode = Mode::Display;
 
   void handleDisplayInput(engine::world::World& world);
-  void handleChangeKeyInput(engine::world::World& newInput);
+  void handleChangeKeyInput(engine::world::World& world);
   void handleConfirmInput(engine::world::World& world);
   void handleErrorInput(engine::world::World& world);
 
@@ -70,6 +69,7 @@ class ControlsMenuState : public SelectedMenuState
                              std::unique_ptr<MenuState> previous,
                              const engine::world::World& world);
 
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/controlswidget.cpp b/src/menu/controlswidget.cpp
index 62e289c17..41c4a820d 100644
--- a/src/menu/controlswidget.cpp
+++ b/src/menu/controlswidget.cpp
@@ -15,7 +15,7 @@
 #include <cstddef>
 #include <functional>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <numeric>
@@ -28,9 +28,9 @@ namespace menu
 {
 namespace
 {
-constexpr const size_t Columns = 3;
+constexpr size_t Columns = 3;
 
-constexpr const std::array<std::array<std::optional<hid::Action>, 5>, Columns> gameplayActions{{
+constexpr std::array<std::array<std::optional<hid::Action>, 5>, Columns> gameplayActions{{
   {
     hid::Action::Forward,
     hid::Action::Backward,
@@ -54,7 +54,7 @@ constexpr const std::array<std::array<std::optional<hid::Action>, 5>, Columns> g
   },
 }};
 
-constexpr const std::array<std::array<std::optional<hid::Action>, 4>, Columns> shortcutActions{{
+constexpr std::array<std::array<std::optional<hid::Action>, 4>, Columns> shortcutActions{{
   {
     hid::Action::DrawPistols,
     hid::Action::DrawShotgun,
@@ -75,7 +75,7 @@ constexpr const std::array<std::array<std::optional<hid::Action>, 4>, Columns> s
   },
 }};
 
-constexpr const std::array<std::array<std::optional<hid::Action>, 4>, Columns> menuActions{{
+constexpr std::array<std::array<std::optional<hid::Action>, 4>, Columns> menuActions{{
   {
     hid::Action::MenuUp,
     hid::Action::MenuDown,
@@ -106,7 +106,7 @@ ControlsWidget::ControlsWidget(const engine::NamedInputMappingConfig& mappingCon
 {
   m_content->setExtents(1, 4);
 
-  auto gridBox = gsl::make_shared<ui::widgets::GridBox>(glm::ivec2{10, ui::OutlineBorderWidth});
+  auto gridBox = gsl_lite::make_shared<ui::widgets::GridBox>(glm::ivec2{10, ui::OutlineBorderWidth});
   gridBox->setExtents(2 * gameplayActions.size(), gameplayActions[0].size());
   gridBox->setSelected({1, 0});
   m_controlGroups.emplace_back(gridBox);
@@ -115,19 +115,20 @@ ControlsWidget::ControlsWidget(const engine::NamedInputMappingConfig& mappingCon
     /* translators: TR charmap encoding */ _("Gameplay"), gridBox);
   m_content->set(0, 1, groupBox);
 
-  gridBox = gsl::make_shared<ui::widgets::GridBox>(glm::ivec2{10, ui::OutlineBorderWidth});
+  gridBox = gsl_lite::make_shared<ui::widgets::GridBox>(glm::ivec2{10, ui::OutlineBorderWidth});
   gridBox->setExtents(2 * shortcutActions.size(), shortcutActions[0].size());
   m_controlGroups.emplace_back(gridBox);
 
-  groupBox = std::make_shared<ui::widgets::GroupBox>(/* translators: TR charmap encoding */ _("Shortcuts"), gridBox);
+  groupBox = std::make_shared<ui::widgets::GroupBox>(
+    /* translators: TR charmap encoding */ _("Shortcuts"), gridBox);
   m_content->set(0, 2, groupBox);
 
-  gridBox = gsl::make_shared<ui::widgets::GridBox>(glm::ivec2{10, ui::OutlineBorderWidth});
+  gridBox = gsl_lite::make_shared<ui::widgets::GridBox>(glm::ivec2{10, ui::OutlineBorderWidth});
   gridBox->setExtents(2 * menuActions.size(), menuActions[0].size());
   m_controlGroups.emplace_back(gridBox);
 
-  groupBox
-    = std::make_shared<ui::widgets::GroupBox>(/* translators: TR charmap encoding */ _("Menu Navigation"), gridBox);
+  groupBox = std::make_shared<ui::widgets::GroupBox>(
+    /* translators: TR charmap encoding */ _("Menu Navigation"), gridBox);
   m_content->set(0, 3, groupBox);
 
   m_content->setSelected({0, 1});
@@ -193,9 +194,9 @@ void ControlsWidget::setSize(const glm::ivec2& size)
   m_container->setSize(size);
 }
 
-void ControlsWidget::update(bool hasFocus)
+void ControlsWidget::tick(const bool hasFocus)
 {
-  m_container->update(hasFocus);
+  m_container->tick(hasFocus);
 }
 
 void ControlsWidget::draw(ui::Ui& ui, const engine::Presenter& presenter) const
@@ -212,8 +213,7 @@ void ControlsWidget::nextRow()
 {
   do
   {
-    const auto& currentGridBox = getCurrentGridBox();
-    if(!currentGridBox->nextRow())
+    if(const auto& currentGridBox = getCurrentGridBox(); !currentGridBox->nextRow())
     {
       if(!m_content->nextRow())
       {
@@ -230,8 +230,7 @@ void ControlsWidget::prevRow()
 {
   do
   {
-    const auto& currentGridBox = getCurrentGridBox();
-    if(!currentGridBox->prevRow())
+    if(const auto& currentGridBox = getCurrentGridBox(); !currentGridBox->prevRow())
     {
       if(!m_content->prevRow() || std::get<1>(m_content->getSelected()) == 0)
       {
@@ -250,8 +249,8 @@ void ControlsWidget::nextColumn()
 {
   do
   {
-    const auto& currentGridBox = getCurrentGridBox();
-    if(!currentGridBox->nextColumn() || !currentGridBox->nextColumn()) // cppcheck-suppress duplicateExpression
+    if(const auto& currentGridBox = getCurrentGridBox(); !currentGridBox->nextColumn() || !currentGridBox->nextColumn())
+    // cppcheck-suppress duplicateExpression
     {
       getCurrentGridBox()->setSelected({1, std::get<1>(currentGridBox->getSelected())});
     }
@@ -263,8 +262,8 @@ void ControlsWidget::prevColumn()
 {
   do
   {
-    const auto& currentGridBox = getCurrentGridBox();
-    if(!currentGridBox->prevColumn() || !currentGridBox->prevColumn()) // cppcheck-suppress duplicateExpression
+    if(const auto& currentGridBox = getCurrentGridBox(); !currentGridBox->prevColumn() || !currentGridBox->prevColumn())
+    // cppcheck-suppress duplicateExpression
     {
       getCurrentGridBox()->setSelected(
         {std::get<0>(currentGridBox->getExtents()) - 1, std::get<1>(currentGridBox->getSelected())});
@@ -274,7 +273,7 @@ void ControlsWidget::prevColumn()
 
 void ControlsWidget::updateBindings(
   const engine::NamedInputMappingConfig& mappingConfig,
-  const std::function<std::shared_ptr<ui::widgets::Widget>(
+  const std::function<std::shared_ptr<Widget>(
     const engine::InputMappingConfig&, const engine::InputMappingConfig&, hid::Action)>& factory)
 {
   m_container->setTitle(mappingConfig.name);
@@ -283,12 +282,13 @@ void ControlsWidget::updateBindings(
                  std::make_shared<ui::widgets::Label>(
                    /* translators: TR charmap encoding */ _("Controller Type: %1%", mappingConfig.controllerType)));
 
-  auto set = [&mappingConfig, &factory](ui::widgets::GridBox& gridBox, size_t x0, size_t y, hid::Action action)
+  auto set =
+    [&mappingConfig, &factory](ui::widgets::GridBox& gridBox, const size_t x0, const size_t y, const hid::Action action)
   {
     gridBox.set(
       x0, y, std::make_shared<ui::widgets::Label>(hid::getName(action), ui::widgets::Label::Alignment::Right));
 
-    auto widget = factory(mappingConfig.gameMappings, mappingConfig.menuMappings, action);
+    const auto widget = factory(mappingConfig.gameMappings, mappingConfig.menuMappings, action);
     widget->fitToContent();
     gridBox.set(x0 + 1, y, widget);
   };
@@ -298,8 +298,7 @@ void ControlsWidget::updateBindings(
     const auto& column = gameplayActions[x];
     for(size_t y = 0; y < column.size(); ++y)
     {
-      const auto& action = column[y];
-      if(action.has_value())
+      if(const auto& action = column[y]; action.has_value())
         set(*m_controlGroups[0], x * 2, y, *action);
     }
   }
@@ -309,8 +308,7 @@ void ControlsWidget::updateBindings(
     const auto& column = shortcutActions[x];
     for(size_t y = 0; y < column.size(); ++y)
     {
-      const auto& action = column[y];
-      if(action.has_value())
+      if(const auto& action = column[y]; action.has_value())
         set(*m_controlGroups[1], x * 2, y, *action);
     }
   }
@@ -320,8 +318,7 @@ void ControlsWidget::updateBindings(
     const auto& column = menuActions[x];
     for(size_t y = 0; y < column.size(); ++y)
     {
-      const auto& action = column[y];
-      if(action.has_value())
+      if(const auto& action = column[y]; action.has_value())
         set(*m_controlGroups[2], x * 2, y, *action);
     }
   }
@@ -350,4 +347,4 @@ bool ControlsWidget::isMenuControlsSelected() const
 {
   return std::get<1>(m_content->getSelected()) == 3;
 }
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/controlswidget.h b/src/menu/controlswidget.h
index f3dbdf65a..249e6d9a5 100644
--- a/src/menu/controlswidget.h
+++ b/src/menu/controlswidget.h
@@ -45,7 +45,7 @@ class ControlsWidget final : public ui::widgets::Widget
 
   void setSize(const glm::ivec2& size) override;
 
-  void update(bool hasFocus) override;
+  void tick(bool hasFocus) override;
 
   void fitToContent() override;
 
@@ -62,7 +62,7 @@ class ControlsWidget final : public ui::widgets::Widget
   void prevColumn();
 
   void updateBindings(const engine::NamedInputMappingConfig& mappingConfig,
-                      const std::function<std::shared_ptr<ui::widgets::Widget>(
+                      const std::function<std::shared_ptr<Widget>(
                         const engine::InputMappingConfig&, const engine::InputMappingConfig&, hid::Action)>& factory);
 
   [[nodiscard]] hid::Action getCurrentAction() const;
diff --git a/src/menu/deflateringmenustate.cpp b/src/menu/deflateringmenustate.cpp
index 8a7e3ad56..2857c245e 100644
--- a/src/menu/deflateringmenustate.cpp
+++ b/src/menu/deflateringmenustate.cpp
@@ -13,10 +13,7 @@
 
 namespace menu
 {
-void DeflateRingMenuState::handleObject(ui::Ui& /*ui*/,
-                                        engine::world::World& world,
-                                        MenuDisplay& display,
-                                        MenuObject& object)
+void DeflateRingMenuState::handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object)
 {
   if(&object == &display.getCurrentRing().getSelectedObject())
   {
@@ -28,25 +25,28 @@ void DeflateRingMenuState::handleObject(ui::Ui& /*ui*/,
   }
 }
 
-std::unique_ptr<MenuState>
-  DeflateRingMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+std::unique_ptr<MenuState> DeflateRingMenuState::tick(engine::world::World& /*world*/, MenuDisplay& /*display*/)
 {
-  if(m_duration == 0_frame)
+  if(m_duration == 0_tick)
     return std::move(m_next);
 
-  m_duration -= 1_frame;
-  m_ringTransform->ringRotation -= 180_deg / Duration * 1_frame;
+  m_duration -= 1_tick;
+  m_ringTransform->ringRotation -= 180_deg / Duration * 1_tick;
   m_ringTransform->radius = exactScale(m_initialRadius, m_duration, Duration);
   m_ringTransform->cameraPos.Y += m_cameraSpeedY;
   m_ringTransform->cameraPos.Z = exactScale(m_targetPosZ, Duration - m_duration, Duration)
                                  + MenuRingTransform::CameraZPosOffset + m_ringTransform->radius;
   m_ringTransform->cameraRotX
-    = m_initialCameraRotX + exactScale(m_targetRotX - m_initialCameraRotX, Duration - m_duration - 1_frame, Duration);
+    = m_initialCameraRotX + exactScale(m_targetRotX - m_initialCameraRotX, Duration - m_duration - 1_tick, Duration);
   return nullptr;
 }
 
+void DeflateRingMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
+
 DeflateRingMenuState::DeflateRingMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
-                                           Direction direction,
+                                           const Direction direction,
                                            std::unique_ptr<MenuState> next)
     : MenuState{ringTransform}
     , m_next{std::move(next)}
@@ -63,6 +63,6 @@ void DeflateRingMenuState::begin(engine::world::World& /*world*/)
   // TODO fadeOutInventory(mode != InventoryMode::TitleMode);
   m_initialRadius = m_ringTransform->radius;
   m_initialCameraRotX = m_ringTransform->cameraRotX;
-  m_cameraSpeedY = (m_targetPosY - m_ringTransform->cameraPos.Y) / Duration * 1_frame;
+  m_cameraSpeedY = (m_targetPosY - m_ringTransform->cameraPos.Y) / Duration * 1_tick;
 }
 } // namespace menu
diff --git a/src/menu/deflateringmenustate.h b/src/menu/deflateringmenustate.h
index ff246560f..99f86a968 100644
--- a/src/menu/deflateringmenustate.h
+++ b/src/menu/deflateringmenustate.h
@@ -23,11 +23,10 @@ struct MenuDisplay;
 struct MenuObject;
 struct MenuRingTransform;
 
-class DeflateRingMenuState : public MenuState
+class DeflateRingMenuState final : public MenuState
 {
-private:
-  static constexpr core::Frame Duration = 32_frame / 2;
-  core::Frame m_duration{Duration};
+  static constexpr core::Tick Duration = 32_tick / 2;
+  core::Tick m_duration{Duration};
   std::unique_ptr<MenuState> m_next;
   core::Length m_initialRadius;
   core::Angle m_initialCameraRotX;
@@ -50,7 +49,8 @@ class DeflateRingMenuState : public MenuState
 
   void begin(engine::world::World& world) override;
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/deselectingmenustate.cpp b/src/menu/deselectingmenustate.cpp
index f910d86a5..6a8afe947 100644
--- a/src/menu/deselectingmenustate.cpp
+++ b/src/menu/deselectingmenustate.cpp
@@ -11,16 +11,16 @@
 
 namespace menu
 {
-std::unique_ptr<MenuState>
-  DeselectingMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+std::unique_ptr<MenuState> DeselectingMenuState::tick(engine::world::World& /*world*/, MenuDisplay& /*display*/)
 {
   return create<IdleRingMenuState>(false);
 }
 
-void DeselectingMenuState::handleObject(ui::Ui& /*ui*/,
-                                        engine::world::World& /*world*/,
-                                        MenuDisplay& display,
-                                        MenuObject& object)
+void DeselectingMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
+
+void DeselectingMenuState::handleObjectTick(engine::world::World& /*world*/, MenuDisplay& display, MenuObject& object)
 {
   if(&object != &display.getCurrentRing().getSelectedObject())
     zeroRotation(object, 256_au);
diff --git a/src/menu/deselectingmenustate.h b/src/menu/deselectingmenustate.h
index b76d8d6df..5a53cc4e3 100644
--- a/src/menu/deselectingmenustate.h
+++ b/src/menu/deselectingmenustate.h
@@ -20,12 +20,13 @@ struct MenuDisplay;
 struct MenuObject;
 struct MenuRingTransform;
 
-class DeselectingMenuState : public MenuState
+class DeselectingMenuState final : public MenuState
 {
 public:
   explicit DeselectingMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform);
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/donemenustate.cpp b/src/menu/donemenustate.cpp
index 80d308949..c2d493f64 100644
--- a/src/menu/donemenustate.cpp
+++ b/src/menu/donemenustate.cpp
@@ -6,6 +6,7 @@
 #include "engine/items_tr1.h"
 #include "engine/objectmanager.h"
 #include "engine/player.h"
+#include "engine/presenter.h"
 #include "engine/world/world.h"
 #include "menudisplay.h"
 #include "menuring.h"
@@ -18,7 +19,7 @@ namespace menu
 {
 class MenuState;
 
-void DoneMenuState::handleObject(ui::Ui& /*ui*/, engine::world::World& world, MenuDisplay& display, MenuObject& object)
+void DoneMenuState::handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object)
 {
   if(&object == &display.getCurrentRing().getSelectedObject())
   {
@@ -30,36 +31,48 @@ void DoneMenuState::handleObject(ui::Ui& /*ui*/, engine::world::World& world, Me
   }
 }
 
-std::unique_ptr<MenuState> DoneMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& world, MenuDisplay& display)
+std::unique_ptr<MenuState> DoneMenuState::tick(engine::world::World& world, MenuDisplay& display)
 {
   display.result = m_result;
 
   switch(display.inventoryChosen.value_or(engine::TR1ItemId::Lara))
   {
   case engine::TR1ItemId::Pistols:
-    world.getPlayer().getInventory().tryUse(
-      world.getObjectManager().getLara(), engine::TR1ItemId::Pistols, world.getEngine().getGameplayRules());
+    world.getPlayer().getInventory().tryUse(world.getObjectManager().getLara(),
+                                            engine::TR1ItemId::Pistols,
+                                            world.getEngine().getGameplayRules(),
+                                            world.getEngine().getPresenter().getInputHandler());
     break;
   case engine::TR1ItemId::Shotgun:
-    world.getPlayer().getInventory().tryUse(
-      world.getObjectManager().getLara(), engine::TR1ItemId::Shotgun, world.getEngine().getGameplayRules());
+    world.getPlayer().getInventory().tryUse(world.getObjectManager().getLara(),
+                                            engine::TR1ItemId::Shotgun,
+                                            world.getEngine().getGameplayRules(),
+                                            world.getEngine().getPresenter().getInputHandler());
     break;
   case engine::TR1ItemId::Magnums:
-    world.getPlayer().getInventory().tryUse(
-      world.getObjectManager().getLara(), engine::TR1ItemId::Magnums, world.getEngine().getGameplayRules());
+    world.getPlayer().getInventory().tryUse(world.getObjectManager().getLara(),
+                                            engine::TR1ItemId::Magnums,
+                                            world.getEngine().getGameplayRules(),
+                                            world.getEngine().getPresenter().getInputHandler());
     break;
   case engine::TR1ItemId::Uzis:
-    world.getPlayer().getInventory().tryUse(
-      world.getObjectManager().getLara(), engine::TR1ItemId::Uzis, world.getEngine().getGameplayRules());
+    world.getPlayer().getInventory().tryUse(world.getObjectManager().getLara(),
+                                            engine::TR1ItemId::Uzis,
+                                            world.getEngine().getGameplayRules(),
+                                            world.getEngine().getPresenter().getInputHandler());
     break;
   case engine::TR1ItemId::SmallMedipack:
-    if(world.getPlayer().getInventory().tryUse(
-         world.getObjectManager().getLara(), engine::TR1ItemId::SmallMedipack, world.getEngine().getGameplayRules()))
+    if(world.getPlayer().getInventory().tryUse(world.getObjectManager().getLara(),
+                                               engine::TR1ItemId::SmallMedipack,
+                                               world.getEngine().getGameplayRules(),
+                                               world.getEngine().getPresenter().getInputHandler()))
       ++world.getPlayer().smallMedipacks;
     break;
   case engine::TR1ItemId::LargeMedipack:
-    if(world.getPlayer().getInventory().tryUse(
-         world.getObjectManager().getLara(), engine::TR1ItemId::LargeMedipack, world.getEngine().getGameplayRules()))
+    if(world.getPlayer().getInventory().tryUse(world.getObjectManager().getLara(),
+                                               engine::TR1ItemId::LargeMedipack,
+                                               world.getEngine().getGameplayRules(),
+                                               world.getEngine().getPresenter().getInputHandler()))
       ++world.getPlayer().largeMedipacks;
     break;
   default:
@@ -68,4 +81,8 @@ std::unique_ptr<MenuState> DoneMenuState::onFrame(ui::Ui& /*ui*/, engine::world:
 
   return nullptr;
 }
+
+void DoneMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
 } // namespace menu
diff --git a/src/menu/donemenustate.h b/src/menu/donemenustate.h
index 353ebfddd..d9694f66a 100644
--- a/src/menu/donemenustate.h
+++ b/src/menu/donemenustate.h
@@ -25,14 +25,15 @@ struct MenuRingTransform;
 class DoneMenuState : public MenuState
 {
 public:
-  explicit DoneMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform, MenuResult result)
+  explicit DoneMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform, const MenuResult result)
       : MenuState{ringTransform}
       , m_result{result}
   {
   }
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 
 private:
   MenuResult m_result;
diff --git a/src/menu/finishitemanimationmenustate.cpp b/src/menu/finishitemanimationmenustate.cpp
index 9466f76dd..732018311 100644
--- a/src/menu/finishitemanimationmenustate.cpp
+++ b/src/menu/finishitemanimationmenustate.cpp
@@ -13,27 +13,29 @@
 
 namespace menu
 {
-std::unique_ptr<MenuState>
-  FinishItemAnimationMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& world, MenuDisplay& display)
+std::unique_ptr<MenuState> FinishItemAnimationMenuState::tick(engine::world::World& world, MenuDisplay& display)
 {
   auto& object = display.getCurrentRing().getSelectedObject();
-  if(object.animate())
+  if(object.tick())
     return nullptr; // play full animation until its end
 
   if(object.type == engine::TR1ItemId::PassportOpening)
   {
     object.type = engine::TR1ItemId::PassportClosed;
-    object.meshAnimFrame = 0_frame;
+    object.meshAnimFrame = 0_mframe;
     object.initModel(world, display.getLightsBuffer());
   }
 
   return std::move(m_next);
 }
 
-void FinishItemAnimationMenuState::handleObject(ui::Ui& /*ui*/,
-                                                engine::world::World& /*world*/,
-                                                MenuDisplay& display,
-                                                MenuObject& object)
+void FinishItemAnimationMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
+
+void FinishItemAnimationMenuState::handleObjectTick(engine::world::World& /*world*/,
+                                                    MenuDisplay& display,
+                                                    MenuObject& object)
 {
   if(&object != &display.getCurrentRing().getSelectedObject())
     zeroRotation(object, 256_au);
diff --git a/src/menu/finishitemanimationmenustate.h b/src/menu/finishitemanimationmenustate.h
index b4b7297c7..2ed25d3aa 100644
--- a/src/menu/finishitemanimationmenustate.h
+++ b/src/menu/finishitemanimationmenustate.h
@@ -23,7 +23,6 @@ struct MenuRingTransform;
 
 class FinishItemAnimationMenuState : public MenuState
 {
-private:
   std::unique_ptr<MenuState> m_next;
 
 public:
@@ -34,7 +33,8 @@ class FinishItemAnimationMenuState : public MenuState
   {
   }
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/gameplayrulesmenustate.cpp b/src/menu/gameplayrulesmenustate.cpp
index 94348b03a..c46b45c76 100644
--- a/src/menu/gameplayrulesmenustate.cpp
+++ b/src/menu/gameplayrulesmenustate.cpp
@@ -22,7 +22,7 @@
 
 #include <functional>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 #include <tuple>
@@ -40,20 +40,20 @@ GameplayRulesMenuState::GameplayRulesMenuState(const std::shared_ptr<MenuRingTra
     , m_rules{rules}
 
 {
-  auto listBox = gsl::make_shared<ui::widgets::CheckListBox>();
-  m_listBox = listBox;                                   // cppcheck-suppress useInitializationList
-  m_container = gsl::make_unique<ui::widgets::GroupBox>( // cppcheck-suppress useInitializationList
+  auto listBox = gsl_lite::make_shared<ui::widgets::CheckListBox>();
+  m_listBox = listBox;                                        // cppcheck-suppress useInitializationList
+  m_container = gsl_lite::make_unique<ui::widgets::GroupBox>( // cppcheck-suppress useInitializationList
     /* translators: TR charmap encoding */ _("Rules"),
     listBox);
 
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("No Loads"),
-    [this]()
+    [this]
     {
       return m_rules.noLoads;
     },
-    [this]()
+    [this]
     {
       m_rules.noLoads = !m_rules.noLoads;
     });
@@ -63,11 +63,11 @@ GameplayRulesMenuState::GameplayRulesMenuState(const std::shared_ptr<MenuRingTra
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("No Meds"),
-    [this]()
+    [this]
     {
       return m_rules.noMeds;
     },
-    [this]()
+    [this]
     {
       m_rules.noMeds = !m_rules.noMeds;
     });
@@ -77,11 +77,11 @@ GameplayRulesMenuState::GameplayRulesMenuState(const std::shared_ptr<MenuRingTra
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Pistols Only"),
-    [this]()
+    [this]
     {
       return m_rules.pistolsOnly;
     },
-    [this]()
+    [this]
     {
       m_rules.pistolsOnly = !m_rules.pistolsOnly;
     });
@@ -91,11 +91,11 @@ GameplayRulesMenuState::GameplayRulesMenuState(const std::shared_ptr<MenuRingTra
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("No Cheats"),
-    [this]()
+    [this]
     {
       return m_rules.noCheats;
     },
-    [this]()
+    [this]
     {
       m_rules.noCheats = !m_rules.noCheats;
     });
@@ -105,11 +105,11 @@ GameplayRulesMenuState::GameplayRulesMenuState(const std::shared_ptr<MenuRingTra
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("No Hits"),
-    [this]()
+    [this]
     {
       return m_rules.noHits;
     },
-    [this]()
+    [this]
     {
       m_rules.noHits = !m_rules.noHits;
     });
@@ -127,30 +127,20 @@ GameplayRulesMenuState::GameplayRulesMenuState(const std::shared_ptr<MenuRingTra
   }
 }
 
-std::unique_ptr<MenuState>
-  GameplayRulesMenuState::onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+std::unique_ptr<MenuState> GameplayRulesMenuState::tick(engine::world::World& world, MenuDisplay& /*display*/)
 {
-  m_container->setPosition(
-    {(ui.getSize().x - m_container->getSize().x) / 2, ui.getSize().y - m_container->getSize().y - 90});
-  m_container->update(true);
-  m_container->draw(ui, world.getPresenter());
+  m_container->tick(true);
   world.getEngine().setGameplayRules(m_rules);
 
-  {
-    const auto& description = m_descriptions.at(m_listBox->getSelectedIndex());
-    description->setPosition({(ui.getSize().x - MaxDescriptionWidth) / 2,
-                              m_listBox->getPosition().y - description->getSize().y - 3 * ui::FontHeight});
-    description->draw(ui, world.getPresenter());
-  }
-
-  if(world.getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(hid::AxisMovement::Forward))
+  if(world.getEngine().getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
+       hid::AxisMovement::Forward))
   {
     if(!m_listBox->prevEntry())
     {
       m_listBox->setSelectedEntry(m_listBox->getEntryCount() - 1);
     }
   }
-  else if(world.getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
+  else if(world.getEngine().getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
             hid::AxisMovement::Backward))
   {
     if(!m_listBox->nextEntry())
@@ -158,13 +148,13 @@ std::unique_ptr<MenuState>
       m_listBox->setSelectedEntry(0);
     }
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     const auto& [getter, toggler, checkbox] = m_listBox->getSelected();
     toggler();
     checkbox->setChecked(getter());
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
   {
     return std::move(m_previous);
   }
@@ -172,5 +162,19 @@ std::unique_ptr<MenuState>
   return nullptr;
 }
 
+void GameplayRulesMenuState::constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+{
+  m_container->setPosition(
+    {(ui.getSize().x - m_container->getSize().x) / 2, ui.getSize().y - m_container->getSize().y - 90});
+  m_container->draw(ui, world.getEngine().getPresenter());
+
+  {
+    const auto& description = m_descriptions.at(m_listBox->getSelectedIndex());
+    description->setPosition({(ui.getSize().x - MaxDescriptionWidth) / 2,
+                              m_listBox->getPosition().y - description->getSize().y - 3 * ui::FontHeight});
+    description->draw(ui, world.getEngine().getPresenter());
+  }
+}
+
 GameplayRulesMenuState::~GameplayRulesMenuState() = default;
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/gameplayrulesmenustate.h b/src/menu/gameplayrulesmenustate.h
index 0bac0cd3b..d09661185 100644
--- a/src/menu/gameplayrulesmenustate.h
+++ b/src/menu/gameplayrulesmenustate.h
@@ -34,9 +34,8 @@ struct MenuDisplay;
 struct MenuRingTransform;
 class MenuState;
 
-class GameplayRulesMenuState : public SelectedMenuState
+class GameplayRulesMenuState final : public SelectedMenuState
 {
-private:
   std::shared_ptr<ui::widgets::CheckListBox> m_listBox;
   std::vector<std::shared_ptr<ui::widgets::TextBox>> m_descriptions;
   std::unique_ptr<MenuState> m_previous;
@@ -48,7 +47,8 @@ class GameplayRulesMenuState : public SelectedMenuState
                                   std::unique_ptr<MenuState> previous,
                                   const engine::GameplayRules& rules);
 
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
   ~GameplayRulesMenuState() override;
 };
 } // namespace menu
diff --git a/src/menu/idleringmenustate.cpp b/src/menu/idleringmenustate.cpp
index f79e4df36..d5ccd25f2 100644
--- a/src/menu/idleringmenustate.cpp
+++ b/src/menu/idleringmenustate.cpp
@@ -5,6 +5,7 @@
 #include "deflateringmenustate.h"
 #include "donemenustate.h"
 #include "engine/audioengine.h"
+#include "engine/engine.h"
 #include "engine/items_tr1.h"
 #include "engine/presenter.h"
 #include "engine/soundeffects_tr1.h"
@@ -30,35 +31,23 @@
 
 namespace menu
 {
-std::unique_ptr<MenuState> IdleRingMenuState::onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+std::unique_ptr<MenuState> IdleRingMenuState::tick(engine::world::World& world, MenuDisplay& display)
 {
-  auto& presenter = world.getPresenter();
+  const auto& inputHandler = world.getEngine().getPresenter().getInputHandler();
 
-  {
-    const auto& currentObject = display.getCurrentRing().getSelectedObject();
-    const ui::Text text{world.getItemTitle(currentObject.type).value_or(currentObject.name)};
-    text.draw(ui,
-              presenter.getTrFont(),
-              {(ui.getSize().x - text.getWidth()) / 2, ui.getSize().y - RingInfoYMargin - ui::FontHeight});
-
-    MenuDisplay::drawMenuObjectDescription(ui, world, currentObject);
-  }
-
-  if(presenter.getInputHandler().getInputState().menuXMovement == hid::AxisMovement::Right
-     && display.getCurrentRing().list.size() > 1)
+  if(inputHandler.getInputState().menuXMovement == hid::AxisMovement::Right && display.getCurrentRing().list.size() > 1)
   {
     world.getAudioEngine().playSoundEffect(engine::TR1SoundEffect::MenuMove, nullptr);
     return create<RotateLeftRightMenuState>(true, display.getCurrentRing(), std::move(display.m_currentState));
   }
 
-  if(presenter.getInputHandler().getInputState().menuXMovement == hid::AxisMovement::Left
-     && display.getCurrentRing().list.size() > 1)
+  if(inputHandler.getInputState().menuXMovement == hid::AxisMovement::Left && display.getCurrentRing().list.size() > 1)
   {
     world.getAudioEngine().playSoundEffect(engine::TR1SoundEffect::MenuMove, nullptr);
     return create<RotateLeftRightMenuState>(false, display.getCurrentRing(), std::move(display.m_currentState));
   }
 
-  if(presenter.getInputHandler().hasDebouncedAction(hid::Action::Return) && display.allowMenuClose)
+  if(inputHandler.hasDebouncedAction(hid::Action::Return) && display.allowMenuClose)
   {
     world.getAudioEngine().playSoundEffect(engine::TR1SoundEffect::MenuOptionEscape, nullptr);
     display.inventoryChosen.reset();
@@ -66,7 +55,7 @@ std::unique_ptr<MenuState> IdleRingMenuState::onFrame(ui::Ui& ui, engine::world:
                                         create<DoneMenuState>(MenuResult::Closed));
   }
 
-  if(m_autoSelect || presenter.getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  if(m_autoSelect || inputHandler.hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     display.passOpen = true;
 
@@ -95,17 +84,17 @@ std::unique_ptr<MenuState> IdleRingMenuState::onFrame(ui::Ui& ui, engine::world:
     }
 
     currentObject.goalFrame = currentObject.openFrame;
-    currentObject.animDirection = 1_frame;
+    currentObject.animDirection = 1_mframe;
     return create<ApplyItemTransformMenuState>();
   }
 
-  if(presenter.getInputHandler().getInputState().menuZMovement.justChangedTo(hid::AxisMovement::Forward)
+  if(inputHandler.getInputState().menuZMovement.justChangedTo(hid::AxisMovement::Forward)
      && display.currentRingIndex > 0)
   {
     return create<DeflateRingMenuState>(DeflateRingMenuState::Direction::Down,
                                         create<SwitchRingMenuState>(display.currentRingIndex - 1, false));
   }
-  else if(presenter.getInputHandler().getInputState().menuZMovement.justChangedTo(hid::AxisMovement::Backward)
+  else if(inputHandler.getInputState().menuZMovement.justChangedTo(hid::AxisMovement::Backward)
           && display.currentRingIndex + 1 < display.rings.size())
   {
     return create<DeflateRingMenuState>(DeflateRingMenuState::Direction::Up,
@@ -115,10 +104,18 @@ std::unique_ptr<MenuState> IdleRingMenuState::onFrame(ui::Ui& ui, engine::world:
   return nullptr;
 }
 
-void IdleRingMenuState::handleObject(ui::Ui& /*ui*/,
-                                     engine::world::World& world,
-                                     MenuDisplay& display,
-                                     MenuObject& object)
+void IdleRingMenuState::constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+{
+  const auto& currentObject = display.getCurrentRing().getSelectedObject();
+  const ui::Text text{world.getItemTitle(currentObject.type).value_or(currentObject.name)};
+  text.draw(ui,
+            world.getEngine().getPresenter().getTrFont(),
+            {(ui.getSize().x - text.getWidth()) / 2, ui.getSize().y - RingInfoYMargin - ui::FontHeight});
+
+  MenuDisplay::constructMenuObjectDescription(ui, world, currentObject);
+}
+
+void IdleRingMenuState::handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object)
 {
   if(&object == &display.getCurrentRing().getSelectedObject())
   {
diff --git a/src/menu/idleringmenustate.h b/src/menu/idleringmenustate.h
index dff41d011..928395de1 100644
--- a/src/menu/idleringmenustate.h
+++ b/src/menu/idleringmenustate.h
@@ -20,19 +20,19 @@ struct MenuDisplay;
 struct MenuObject;
 struct MenuRingTransform;
 
-class IdleRingMenuState : public MenuState
+class IdleRingMenuState final : public MenuState
 {
-private:
   bool m_autoSelect;
 
 public:
-  explicit IdleRingMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform, bool autoSelect)
+  explicit IdleRingMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform, const bool autoSelect)
       : MenuState{ringTransform}
       , m_autoSelect{autoSelect}
   {
   }
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/inflateringmenustate.cpp b/src/menu/inflateringmenustate.cpp
index 69653adad..42d0ef121 100644
--- a/src/menu/inflateringmenustate.cpp
+++ b/src/menu/inflateringmenustate.cpp
@@ -13,10 +13,9 @@
 
 namespace menu
 {
-std::unique_ptr<MenuState>
-  InflateRingMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& display)
+std::unique_ptr<MenuState> InflateRingMenuState::tick(engine::world::World& /*world*/, MenuDisplay& display)
 {
-  if(m_duration == 0_frame)
+  if(m_duration == 0_tick)
   {
     bool doAutoSelect = false;
     if(display.rings.size() == 1 && !display.passOpen && display.mode != InventoryMode::TitleMode)
@@ -27,7 +26,7 @@ std::unique_ptr<MenuState>
     return create<IdleRingMenuState>(doAutoSelect);
   }
 
-  m_duration -= 1_frame;
+  m_duration -= 1_tick;
   m_ringTransform->ringRotation
     = display.getCurrentRing().getCurrentObjectAngle() - exactScale(90_deg, m_duration, Duration);
   m_ringTransform->cameraRotX = exactScale(m_initialCameraRotX, m_duration, Duration);
@@ -38,10 +37,11 @@ std::unique_ptr<MenuState>
   return nullptr;
 }
 
-void InflateRingMenuState::handleObject(ui::Ui& /*ui*/,
-                                        engine::world::World& world,
-                                        MenuDisplay& display,
-                                        MenuObject& object)
+void InflateRingMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
+
+void InflateRingMenuState::handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object)
 {
   if(&object == &display.getCurrentRing().getSelectedObject())
   {
@@ -53,7 +53,8 @@ void InflateRingMenuState::handleObject(ui::Ui& /*ui*/,
   }
 }
 
-InflateRingMenuState::InflateRingMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform, bool fromBackpack)
+InflateRingMenuState::InflateRingMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
+                                           const bool fromBackpack)
     : MenuState{ringTransform}
     , m_targetPosZ{fromBackpack ? MenuRingTransform::CameraBackpackZPos : 0_len}
 {
@@ -62,8 +63,8 @@ InflateRingMenuState::InflateRingMenuState(const std::shared_ptr<MenuRingTransfo
 void InflateRingMenuState::begin(engine::world::World& /*world*/)
 {
   m_initialCameraRotX = m_ringTransform->cameraRotX;
-  m_radiusSpeed = (MenuRingTransform::IdleCameraZPosOffset - m_ringTransform->radius) / Duration * 1_frame;
-  m_cameraSpeedY = (MenuRingTransform::IdleCameraYPosOffset - m_ringTransform->cameraPos.Y) / Duration * 1_frame;
+  m_radiusSpeed = (MenuRingTransform::IdleCameraZPosOffset - m_ringTransform->radius) / Duration * 1_tick;
+  m_cameraSpeedY = (MenuRingTransform::IdleCameraYPosOffset - m_ringTransform->cameraPos.Y) / Duration * 1_tick;
   m_ringTransform->cameraPos.Z = m_targetPosZ + MenuRingTransform::CameraZPosOffset + m_ringTransform->radius;
 }
 } // namespace menu
diff --git a/src/menu/inflateringmenustate.h b/src/menu/inflateringmenustate.h
index 316433a01..b68fb1c31 100644
--- a/src/menu/inflateringmenustate.h
+++ b/src/menu/inflateringmenustate.h
@@ -24,9 +24,8 @@ struct MenuRingTransform;
 
 class InflateRingMenuState : public MenuState
 {
-private:
-  static constexpr core::Frame Duration = 24_frame / 2;
-  core::Frame m_duration{Duration};
+  static constexpr core::Tick Duration = 24_tick / 2;
+  core::Tick m_duration{Duration};
   core::Angle m_initialCameraRotX;
   core::Length m_radiusSpeed;
   core::Length m_cameraSpeedY;
@@ -36,7 +35,8 @@ class InflateRingMenuState : public MenuState
   explicit InflateRingMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform, bool fromBackpack);
 
   void begin(engine::world::World& world) override;
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/listdisplaymenustate.cpp b/src/menu/listdisplaymenustate.cpp
index c5bcc4a79..56d0ae0c5 100644
--- a/src/menu/listdisplaymenustate.cpp
+++ b/src/menu/listdisplaymenustate.cpp
@@ -1,6 +1,7 @@
 #include "listdisplaymenustate.h"
 
 #include "core/i18n.h"
+#include "engine/engine.h"
 #include "engine/presenter.h"
 #include "engine/world/world.h"
 #include "hid/actions.h"
@@ -17,7 +18,7 @@
 #include <cstddef>
 #include <gl/pixel.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -33,32 +34,33 @@ ListDisplayMenuState::ListDisplayMenuState(const std::shared_ptr<MenuRingTransfo
 {
 }
 
-std::unique_ptr<MenuState> ListDisplayMenuState::onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+std::unique_ptr<MenuState> ListDisplayMenuState::tick(engine::world::World& world, MenuDisplay& display)
 {
-  draw(ui, world, display);
-
-  if(world.getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(hid::AxisMovement::Forward))
+  if(world.getEngine().getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
+       hid::AxisMovement::Forward))
   {
     m_listBox->prevEntry();
   }
-  else if(world.getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
+  else if(world.getEngine().getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
             hid::AxisMovement::Backward))
   {
     m_listBox->nextEntry();
   }
-  if(world.getPresenter().getInputHandler().getInputState().menuXMovement.justChangedTo(hid::AxisMovement::Left))
+  if(world.getEngine().getPresenter().getInputHandler().getInputState().menuXMovement.justChangedTo(
+       hid::AxisMovement::Left))
   {
     m_listBox->prevPage();
   }
-  else if(world.getPresenter().getInputHandler().getInputState().menuXMovement.justChangedTo(hid::AxisMovement::Right))
+  else if(world.getEngine().getPresenter().getInputHandler().getInputState().menuXMovement.justChangedTo(
+            hid::AxisMovement::Right))
   {
     m_listBox->nextPage();
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     return onSelected(m_listBox->getSelected(), world, display);
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
   {
     return onAborted();
   }
@@ -71,7 +73,7 @@ size_t ListDisplayMenuState::append(const gslu::nn_shared<ui::widgets::Widget>&
   return m_listBox->append(widget);
 }
 
-void ListDisplayMenuState::draw(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+void ListDisplayMenuState::constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
 {
   m_listBox->fitToContent();
   m_groupBox.fitToContent();
@@ -81,14 +83,15 @@ void ListDisplayMenuState::draw(ui::Ui& ui, engine::world::World& world, MenuDis
       {(ui.getSize().x - m_groupBox.getSize().x) / 2, ui.getSize().y - m_groupBox.getSize().y - 90});
   }
 
-  m_groupBox.update(true);
-  m_groupBox.draw(ui, world.getPresenter());
+  m_groupBox.tick(true);
+  m_groupBox.draw(ui, world.getEngine().getPresenter());
 
   if(m_listBox->getTotalPages() <= 1)
     return;
 
   ui::widgets::Label pageLabel{pgettext("PagedList",
-                                        /* translators: TR charmap encoding */ "Page %1% of %2%",
+                                        /* translators: TR charmap encoding */
+                                        "Page %1% of %2%",
                                         m_listBox->getCurrentPage() + 1,
                                         m_listBox->getTotalPages()),
                                ui::widgets::Label::Alignment::Center};
@@ -98,7 +101,7 @@ void ListDisplayMenuState::draw(ui::Ui& ui, engine::world::World& world, MenuDis
   ui.drawBox(pageLabel.getPosition() - glm::ivec2{0, ui::FontHeight},
              pageLabel.getSize() + glm::ivec2{0, 4},
              gl::SRGBA8{0, 0, 0, ui::DefaultBackgroundAlpha});
-  pageLabel.draw(ui, world.getPresenter());
+  pageLabel.draw(ui, world.getEngine().getPresenter());
 }
 
 void ListDisplayMenuState::clear()
@@ -106,8 +109,8 @@ void ListDisplayMenuState::clear()
   m_listBox->clear();
 }
 
-void ListDisplayMenuState::setSelected(size_t idx)
+void ListDisplayMenuState::setSelected(const size_t idx)
 {
   m_listBox->setSelected(idx);
 }
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/listdisplaymenustate.h b/src/menu/listdisplaymenustate.h
index 149db45a5..880783925 100644
--- a/src/menu/listdisplaymenustate.h
+++ b/src/menu/listdisplaymenustate.h
@@ -32,7 +32,6 @@ struct MenuRingTransform;
 
 class ListDisplayMenuState : public SelectedMenuState
 {
-private:
   gslu::nn_shared<ui::widgets::ListBox> m_listBox;
   ui::widgets::GroupBox m_groupBox;
 
@@ -40,7 +39,8 @@ class ListDisplayMenuState : public SelectedMenuState
   explicit ListDisplayMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
                                 const std::string& heading,
                                 size_t pageSize);
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
   virtual std::unique_ptr<MenuState> onSelected(size_t idx, engine::world::World& world, MenuDisplay& display) = 0;
   virtual std::unique_ptr<MenuState> onAborted() = 0;
 
@@ -54,7 +54,5 @@ class ListDisplayMenuState : public SelectedMenuState
   }
 
   void setSelected(size_t idx);
-
-  void draw(ui::Ui& ui, engine::world::World& world, MenuDisplay& display);
 };
 } // namespace menu
diff --git a/src/menu/menudisplay.cpp b/src/menu/menudisplay.cpp
index dbcce37f5..6b18ce395 100644
--- a/src/menu/menudisplay.cpp
+++ b/src/menu/menudisplay.cpp
@@ -45,7 +45,7 @@
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <stdexcept>
@@ -55,7 +55,7 @@
 
 namespace menu
 {
-void MenuDisplay::drawMenuObjectDescription(ui::Ui& ui, engine::world::World& world, const MenuObject& object)
+void MenuDisplay::constructMenuObjectDescription(ui::Ui& ui, engine::world::World& world, const MenuObject& object)
 {
   size_t totalItemCount = world.getPlayer().getInventory().count(object.type);
   std::string suffix;
@@ -64,7 +64,7 @@ void MenuDisplay::drawMenuObjectDescription(ui::Ui& ui, engine::world::World& wo
   {
     const ui::Text text{ui::makeAmmoString(ammo.getDisplayString())};
     text.draw(ui,
-              world.getPresenter().getTrFont(),
+              world.getEngine().getPresenter().getTrFont(),
               {(ui.getSize().x - text.getWidth()) / 2, ui.getSize().y - RingInfoYMargin - 2 * ui::FontHeight});
   };
 
@@ -123,8 +123,9 @@ void MenuDisplay::drawMenuObjectDescription(ui::Ui& ui, engine::world::World& wo
   case engine::TR1ItemId::SmallMedipackSprite:
   case engine::TR1ItemId::LargeMedipack:
   case engine::TR1ItemId::LargeMedipackSprite:
-    world.getPresenter().initHealthBarTimeout();
-    world.getPresenter().drawBars(ui, world.getWorldGeometry().getPalette(), world.getObjectManager(), false);
+    world.getEngine().getPresenter().initHealthBarTimeout();
+    world.getEngine().getPresenter().constructBars(
+      ui, world.getWorldGeometry().getPalette(), world.getObjectManager(), false);
     break;
   default:
     break;
@@ -134,41 +135,57 @@ void MenuDisplay::drawMenuObjectDescription(ui::Ui& ui, engine::world::World& wo
   {
     const ui::Text text{ui::makeAmmoString(std::to_string(totalItemCount) + suffix)};
     text.draw(ui,
-              world.getPresenter().getTrFont(),
+              world.getEngine().getPresenter().getTrFont(),
               {(ui.getSize().x - text.getWidth()) / 2, ui.getSize().y - RingInfoYMargin - 2 * ui::FontHeight});
   }
 }
 
-void MenuDisplay::update(ui::Ui& ui, engine::world::World& world)
+void MenuDisplay::tick(engine::world::World& world)
 {
-  if(auto newState = m_currentState->onFrame(ui, world, *this))
+  for(auto& menuObject : getCurrentRing().list)
+  {
+    m_currentState->handleObjectTick(world, *this, menuObject);
+  }
+  if(auto newState = m_currentState->tick(world, *this))
   {
     m_currentState = std::move(newState);
     m_currentState->begin(world);
   }
+}
 
+void MenuDisplay::constructUi(ui::Ui& ui, engine::world::World& world)
+{
+  m_currentState->constructUi(ui, world, *this);
+  constructNavigationHints(ui, world);
+}
+
+void MenuDisplay::constructNavigationHints(ui::Ui& ui, const engine::world::World& world) const
+{
   static constexpr int RingInfoXMargin = 20;
   if(currentRingIndex > 0)
   {
-    m_upArrow.draw(ui, world.getPresenter().getTrFont(), {RingInfoXMargin, RingInfoYMargin});
-    m_upArrow.draw(
-      ui, world.getPresenter().getTrFont(), {ui.getSize().x - m_upArrow.getWidth() - RingInfoXMargin, RingInfoYMargin});
+    m_upArrow.draw(ui, world.getEngine().getPresenter().getTrFont(), {RingInfoXMargin, RingInfoYMargin});
+    m_upArrow.draw(ui,
+                   world.getEngine().getPresenter().getTrFont(),
+                   {ui.getSize().x - m_upArrow.getWidth() - RingInfoXMargin, RingInfoYMargin});
   }
 
   if(currentRingIndex + 1 < rings.size())
   {
-    m_downArrow.draw(
-      ui, world.getPresenter().getTrFont(), {RingInfoXMargin, ui.getSize().y - RingInfoYMargin + ui::FontHeight});
+    m_downArrow.draw(ui,
+                     world.getEngine().getPresenter().getTrFont(),
+                     {RingInfoXMargin, ui.getSize().y - RingInfoYMargin + ui::FontHeight});
     m_downArrow.draw(
       ui,
-      world.getPresenter().getTrFont(),
+      world.getEngine().getPresenter().getTrFont(),
       {ui.getSize().x - m_downArrow.getWidth() - RingInfoXMargin, ui.getSize().y - RingInfoYMargin + ui::FontHeight});
   }
 
   if(rings.size() > 1)
   {
     const ui::Text title{getCurrentRing().title};
-    title.draw(ui, world.getPresenter().getTrFont(), {(ui.getSize().x - title.getWidth()) / 2, RingInfoYMargin});
+    title.draw(
+      ui, world.getEngine().getPresenter().getTrFont(), {(ui.getSize().x - title.getWidth()) / 2, RingInfoYMargin});
   }
 }
 
@@ -206,19 +223,19 @@ bool MenuDisplay::doOptions(engine::world::World& world, MenuObject& object)
   case engine::TR1ItemId::Flashlight:
     BOOST_THROW_EXCEPTION(std::runtime_error("Gamma options are not implemented"));
   case engine::TR1ItemId::Compass:
-    if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return)
-       || world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+    if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return)
+       || world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
     {
-      object.animDirection = 1_frame;
-      object.goalFrame = object.lastMeshAnimFrame - 1_frame;
+      object.animDirection = 1_mframe;
+      object.goalFrame = object.lastMeshAnimFrame - 1_mframe;
     }
     break;
   default:
-    if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return)
-       || world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+    if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return)
+       || world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
     {
-      object.animDirection = -1_frame;
-      object.goalFrame = 0_frame;
+      object.animDirection = -1_mframe;
+      object.goalFrame = 0_mframe;
     }
     break;
   }
@@ -226,12 +243,13 @@ bool MenuDisplay::doOptions(engine::world::World& world, MenuObject& object)
   return false;
 }
 
-std::vector<MenuObject> MenuDisplay::getOptionRingObjects(const engine::world::World& world, bool withHomePolaroid)
+std::vector<MenuObject> MenuDisplay::getOptionRingObjects(engine::world::World& world,
+                                                          const bool withHomePolaroid) const
 {
   std::vector objects{MenuObject{/* translators: TR charmap encoding */ _("Game"),
                                  engine::TR1ItemId::PassportClosed,
-                                 30_frame,
-                                 14_frame,
+                                 30_mframe,
+                                 14_mframe,
                                  25_deg,
                                  -24_deg,
                                  0_deg,
@@ -240,24 +258,24 @@ std::vector<MenuObject> MenuDisplay::getOptionRingObjects(const engine::world::W
                                  0x13},
                       MenuObject{/* translators: TR charmap encoding */ _("Controls"),
                                  engine::TR1ItemId::DirectionKeys,
-                                 1_frame,
-                                 0_frame,
+                                 1_mframe,
+                                 0_mframe,
                                  30_deg,
                                  8_deg,
                                  0_deg,
                                  352_len},
                       MenuObject{/* translators: TR charmap encoding */ _("Sound"),
                                  engine::TR1ItemId::CassettePlayer,
-                                 1_frame,
-                                 0_frame,
+                                 1_mframe,
+                                 0_mframe,
                                  26_deg,
                                  -13_deg,
                                  0_deg,
                                  368_len},
                       MenuObject{/* translators: TR charmap encoding */ _("Detail Levels"),
                                  engine::TR1ItemId::Sunglasses,
-                                 1_frame,
-                                 0_frame,
+                                 1_mframe,
+                                 0_mframe,
                                  23_deg,
                                  -37_deg,
                                  0_deg,
@@ -266,33 +284,31 @@ std::vector<MenuObject> MenuDisplay::getOptionRingObjects(const engine::world::W
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Gym"),
                                     engine::TR1ItemId::LarasHomePolaroid,
-                                    1_frame,
-                                    0_frame,
+                                    1_mframe,
+                                    0_mframe,
                                     25_deg,
                                     -24_deg,
                                     0_deg,
                                     384_len});
   }
 
-  objects.erase(std::remove_if(objects.begin(),
-                               objects.end(),
-                               [&world](const MenuObject& obj)
-                               {
-                                 return world.getWorldGeometry().findAnimatedModelForType(obj.type) == nullptr;
-                               }),
-                objects.end());
+  std::erase_if(objects,
+                [&world](const MenuObject& obj)
+                {
+                  return world.getWorldGeometry().findAnimatedModelForType(obj.type) == nullptr;
+                });
   for(auto& object : objects)
     object.initModel(world, m_lightsBuffer);
 
   return objects;
 }
 
-std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::World& world)
+std::vector<MenuObject> MenuDisplay::getMainRingObjects(engine::world::World& world) const
 {
   std::vector objects{MenuObject{/* translators: TR charmap encoding */ _("Compass"),
                                  engine::TR1ItemId::Compass,
-                                 25_frame,
-                                 10_frame,
+                                 25_mframe,
+                                 10_mframe,
                                  24_deg,
                                  -45_deg,
                                  0_deg,
@@ -304,8 +320,8 @@ std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::Wor
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Pistols"),
                                     engine::TR1ItemId::Pistols,
-                                    12_frame,
-                                    11_frame,
+                                    12_mframe,
+                                    11_mframe,
                                     18_deg,
                                     -21_deg,
                                     0_deg,
@@ -315,8 +331,8 @@ std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::Wor
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Shotgun"),
                                     engine::TR1ItemId::Shotgun,
-                                    13_frame,
-                                    12_frame,
+                                    13_mframe,
+                                    12_mframe,
                                     18_deg,
                                     0_deg,
                                     -45_deg,
@@ -326,8 +342,8 @@ std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::Wor
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Shotgun Cells"),
                                     engine::TR1ItemId::ShotgunAmmo,
-                                    1_frame,
-                                    0_frame,
+                                    1_mframe,
+                                    0_mframe,
                                     18_deg,
                                     -20_deg,
                                     0_deg,
@@ -338,8 +354,8 @@ std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::Wor
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Magnums"),
                                     engine::TR1ItemId::Magnums,
-                                    12_frame,
-                                    11_frame,
+                                    12_mframe,
+                                    11_mframe,
                                     18_deg,
                                     -20_deg,
                                     0_deg,
@@ -349,8 +365,8 @@ std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::Wor
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Magnum Clips"),
                                     engine::TR1ItemId::MagnumAmmo,
-                                    1_frame,
-                                    0_frame,
+                                    1_mframe,
+                                    0_mframe,
                                     18_deg,
                                     -20_deg,
                                     0_deg,
@@ -361,8 +377,8 @@ std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::Wor
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Uzis"),
                                     engine::TR1ItemId::Uzis,
-                                    13_frame,
-                                    12_frame,
+                                    13_mframe,
+                                    12_mframe,
                                     18_deg,
                                     -20_deg,
                                     0_deg,
@@ -372,8 +388,8 @@ std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::Wor
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Uzi Clips"),
                                     engine::TR1ItemId::UziAmmo,
-                                    1_frame,
-                                    0_frame,
+                                    1_mframe,
+                                    0_mframe,
                                     18_deg,
                                     -20_deg,
                                     0_deg,
@@ -383,8 +399,8 @@ std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::Wor
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Grenade"),
                                     engine::TR1ItemId::Explosive,
-                                    15_frame,
-                                    14_frame,
+                                    15_mframe,
+                                    14_mframe,
                                     28_deg,
                                     0_deg,
                                     0_deg,
@@ -394,8 +410,8 @@ std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::Wor
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Large Medi Pack"),
                                     engine::TR1ItemId::LargeMedipack,
-                                    20_frame,
-                                    19_frame,
+                                    20_mframe,
+                                    19_mframe,
                                     20_deg,
                                     -45_deg,
                                     -22.5_deg,
@@ -405,104 +421,104 @@ std::vector<MenuObject> MenuDisplay::getMainRingObjects(const engine::world::Wor
   {
     objects.emplace_back(MenuObject{/* translators: TR charmap encoding */ _("Small Medi Pack"),
                                     engine::TR1ItemId::SmallMedipack,
-                                    26_frame,
-                                    25_frame,
+                                    26_mframe,
+                                    25_mframe,
                                     22_deg,
                                     -40_deg,
                                     -22.5_deg,
                                     216_len});
   }
 
-  objects.erase(std::remove_if(objects.begin(),
-                               objects.end(),
-                               [&world](const MenuObject& obj)
-                               {
-                                 return world.getWorldGeometry().findAnimatedModelForType(obj.type) == nullptr;
-                               }),
-                objects.end());
+  std::erase_if(objects,
+                [&world](const MenuObject& obj)
+                {
+                  return world.getWorldGeometry().findAnimatedModelForType(obj.type) == nullptr;
+                });
   for(auto& object : objects)
     object.initModel(world, m_lightsBuffer);
 
   return objects;
 }
 
-std::vector<MenuObject> MenuDisplay::getKeysRingObjects(const engine::world::World& world)
+std::vector<MenuObject> MenuDisplay::getKeysRingObjects(engine::world::World& world) const
 {
   std::vector<MenuObject> objects{};
 
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::LeadBar) > 0)
   {
     objects.emplace_back(
-      MenuObject{"Lead Bar", engine::TR1ItemId::LeadBar, 1_frame, 0_frame, 20_deg, -45_deg, -22.5_deg, 352_len});
+      MenuObject{"Lead Bar", engine::TR1ItemId::LeadBar, 1_mframe, 0_mframe, 20_deg, -45_deg, -22.5_deg, 352_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::Key1) > 0)
   {
-    objects.emplace_back(MenuObject{"Key", engine::TR1ItemId::Key1, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+    objects.emplace_back(
+      MenuObject{"Key", engine::TR1ItemId::Key1, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::Key2) > 0)
   {
-    objects.emplace_back(MenuObject{"Key", engine::TR1ItemId::Key2, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+    objects.emplace_back(
+      MenuObject{"Key", engine::TR1ItemId::Key2, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::Key3) > 0)
   {
-    objects.emplace_back(MenuObject{"Key", engine::TR1ItemId::Key3, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+    objects.emplace_back(
+      MenuObject{"Key", engine::TR1ItemId::Key3, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::Key4) > 0)
   {
-    objects.emplace_back(MenuObject{"Key", engine::TR1ItemId::Key4, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+    objects.emplace_back(
+      MenuObject{"Key", engine::TR1ItemId::Key4, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::Puzzle4) > 0)
   {
     objects.emplace_back(
-      MenuObject{"Puzzle", engine::TR1ItemId::Puzzle4, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+      MenuObject{"Puzzle", engine::TR1ItemId::Puzzle4, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::Puzzle3) > 0)
   {
     objects.emplace_back(
-      MenuObject{"Puzzle", engine::TR1ItemId::Puzzle3, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+      MenuObject{"Puzzle", engine::TR1ItemId::Puzzle3, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::Puzzle2) > 0)
   {
     objects.emplace_back(
-      MenuObject{"Puzzle", engine::TR1ItemId::Puzzle2, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+      MenuObject{"Puzzle", engine::TR1ItemId::Puzzle2, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::Puzzle1) > 0)
   {
     objects.emplace_back(
-      MenuObject{"Puzzle", engine::TR1ItemId::Puzzle1, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+      MenuObject{"Puzzle", engine::TR1ItemId::Puzzle1, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::Item149) > 0)
   {
     objects.emplace_back(
-      MenuObject{"Pickup", engine::TR1ItemId::Item149, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+      MenuObject{"Pickup", engine::TR1ItemId::Item149, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::Item148) > 0)
   {
     objects.emplace_back(
-      MenuObject{"Pickup", engine::TR1ItemId::Item148, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+      MenuObject{"Pickup", engine::TR1ItemId::Item148, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
   if(world.getPlayer().getInventory().count(engine::TR1ItemId::ScionPieceCounter) > 0)
   {
     objects.emplace_back(
-      MenuObject{"Scion", engine::TR1ItemId::ScionPieceCounter, 1_frame, 0_frame, 40_deg, -24_deg, 0_deg, 256_len});
+      MenuObject{"Scion", engine::TR1ItemId::ScionPieceCounter, 1_mframe, 0_mframe, 40_deg, -24_deg, 0_deg, 256_len});
   }
 
-  objects.erase(std::remove_if(objects.begin(),
-                               objects.end(),
-                               [&world](const MenuObject& obj)
-                               {
-                                 return world.getWorldGeometry().findAnimatedModelForType(obj.type) == nullptr;
-                               }),
-                objects.end());
+  std::erase_if(objects,
+                [&world](const MenuObject& obj)
+                {
+                  return world.getWorldGeometry().findAnimatedModelForType(obj.type) == nullptr;
+                });
   for(auto& object : objects)
     object.initModel(world, m_lightsBuffer);
 
   return objects;
 }
 
-MenuDisplay::MenuDisplay(InventoryMode mode,
-                         SaveGamePageMode saveGamePageMode,
-                         bool allowPassportExit,
+MenuDisplay::MenuDisplay(const InventoryMode mode,
+                         const SaveGamePageMode saveGamePageMode,
+                         const bool allowPassportExit,
                          engine::world::World& world,
                          const glm::ivec2& viewport)
     : mode{mode}
@@ -512,8 +528,8 @@ MenuDisplay::MenuDisplay(InventoryMode mode,
     , m_currentState{std::make_unique<InflateRingMenuState>(ringTransform, true)}
     , m_upArrow{ui::getSpriteSelector(ui::ArrowUpSprite)}
     , m_downArrow{ui::getSpriteSelector(ui::ArrowDownSprite)}
-    , m_material{world.getPresenter().getMaterialManager()->getFlat(false, false, false)}
-    , m_fb{gsl::make_shared<render::pass::Framebuffer>(
+    , m_material{world.getEngine().getPresenter().getRenderSystem().getMaterialManager().getFlat(false, false, false)}
+    , m_fb{gsl_lite::make_shared<render::pass::Framebuffer>(
         "menu-objects", m_material, render::scene::Translucency::Opaque, viewport)}
     , m_lightsBuffer{std::make_shared<gl::ShaderStorageBuffer<engine::ShaderLight>>(
         "lights-buffer",
@@ -544,7 +560,7 @@ MenuDisplay::MenuDisplay(InventoryMode mode,
 
   m_currentState->begin(world);
 
-  world.getCameraController().getCamera()->setFieldOfView(engine::Presenter::DefaultFov);
+  world.getCameraController().getCamera()->setFieldOfView(core::DefaultFov);
   // TODO fadeInInventory(mode != InventoryMode::TitleMode);
   world.getAudioEngine().playSoundEffect(engine::TR1SoundEffect::MenuOptionPopup, nullptr);
 }
@@ -552,48 +568,45 @@ MenuDisplay::MenuDisplay(InventoryMode mode,
 void MenuDisplay::setViewport(const glm::ivec2& viewport)
 {
   if(m_fb->getOutput()->getTexture()->size() != viewport)
-    m_fb = gsl::make_shared<render::pass::Framebuffer>(
+    m_fb = gsl_lite::make_shared<render::pass::Framebuffer>(
       "menu-objects", m_material, render::scene::Translucency::Opaque, viewport);
 }
 
-void MenuDisplay::renderObjects(ui::Ui& ui, engine::world::World& world)
+void MenuDisplay::renderObjectsToFramebuffer(engine::world::World& world)
 {
-  setViewport(world.getPresenter().getRenderViewport());
+  setViewport(world.getEngine().getPresenter().getRenderViewport());
 
   const auto& camera = world.getCameraController().getCamera();
   camera->setViewMatrix(ringTransform->getView());
-  const auto resetFov = gsl::finally(
-    [oldFOV = camera->getFieldOfViewY(), &camera]()
+  const auto resetFov = gsl_lite::finally(
+    [oldFOV = camera->getFieldOfViewY(), &camera]
     {
       camera->setFieldOfView(oldFOV);
     });
-  camera->setFieldOfView(engine::Presenter::DefaultFov);
+  camera->setFieldOfView(core::DefaultFov);
 
   m_fb->render(
-    [this, &world, &ui]()
+    [this, &world]
     {
       SOGLB_DEBUGGROUP("menu-objects");
       m_fb->getOutput()->getTexture()->clear({0, 0, 0, 0});
       m_fb->getDepthBuffer()->clear(gl::ScalarDepth32F{1.0f});
       world.getCameraController().getCamera()->setViewport(m_fb->getOutput()->getTexture()->size());
 
-      core::Angle itemAngle{0_deg};
+      auto itemAngle{0_deg};
       for(auto& menuObject : getCurrentRing().list)
       {
-        MenuObject* object = &menuObject;
-        m_currentState->handleObject(ui, world, *this, *object);
-
-        object->draw(world, *ringTransform, itemAngle);
+        menuObject.draw(world, *ringTransform, itemAngle);
         itemAngle += getCurrentRing().getAnglePerItem();
       }
     });
 }
 
-void MenuDisplay::renderRenderedObjects(const engine::world::World& world)
+void MenuDisplay::renderFramebuffer(const engine::world::World& world)
 {
-  gl::RenderState::getWantedState().setViewport(world.getPresenter().getDisplayViewport());
+  gl::RenderState::getWantedState().setViewport(world.getEngine().getPresenter().getDisplayViewport());
   m_fb->render();
 }
 
 MenuDisplay::~MenuDisplay() = default;
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/menudisplay.h b/src/menu/menudisplay.h
index 63fdf7bc3..4379b9ee3 100644
--- a/src/menu/menudisplay.h
+++ b/src/menu/menudisplay.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "engine/items_tr1.h"
+#include "menuresult.h"
 #include "menuringtransform.h"
 #include "ui/text.h"
 
@@ -8,7 +9,7 @@
 #include <cstdint>
 #include <gl/buffer.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -55,19 +56,6 @@ struct MenuObject;
 struct MenuRing;
 class MenuState;
 
-enum class MenuResult : uint8_t
-{
-  None,
-  Closed,
-  ExitToTitle,
-  ExitGame,
-  NewGame,
-  RestartLevel,
-  LaraHome,
-  RequestLoad,
-  RequestLevel
-};
-
 enum class SaveGamePageMode : uint8_t
 {
   Skip,
@@ -94,9 +82,11 @@ struct MenuDisplay
   std::shared_ptr<MenuRingTransform> ringTransform = std::make_shared<MenuRingTransform>();
   std::unique_ptr<MenuState> m_currentState;
 
-  void renderObjects(ui::Ui& ui, engine::world::World& world);
-  void update(ui::Ui& ui, engine::world::World& world);
-  void renderRenderedObjects(const engine::world::World& world);
+  void renderObjectsToFramebuffer(engine::world::World& world);
+  void tick(engine::world::World& world);
+  void constructUi(ui::Ui& ui, engine::world::World& world);
+  void constructNavigationHints(ui::Ui& ui, const engine::world::World& world) const;
+  void renderFramebuffer(const engine::world::World& world);
   MenuResult result = MenuResult::None;
   std::optional<size_t> requestLoad;
   size_t requestLevelSequenceIndex = 0;
@@ -105,7 +95,7 @@ struct MenuDisplay
   size_t currentRingIndex = 0;
   bool passOpen = false;
   static bool doOptions(engine::world::World& world, MenuObject& object);
-  static void drawMenuObjectDescription(ui::Ui& ui, engine::world::World& world, const MenuObject& object);
+  static void constructMenuObjectDescription(ui::Ui& ui, engine::world::World& world, const MenuObject& object);
 
   [[nodiscard]] MenuRing& getCurrentRing()
   {
@@ -125,9 +115,9 @@ struct MenuDisplay
   }
 
 private:
-  [[nodiscard]] std::vector<MenuObject> getOptionRingObjects(const engine::world::World& world, bool withHomePolaroid);
-  [[nodiscard]] std::vector<MenuObject> getMainRingObjects(const engine::world::World& world);
-  [[nodiscard]] std::vector<MenuObject> getKeysRingObjects(const engine::world::World& world);
+  [[nodiscard]] std::vector<MenuObject> getOptionRingObjects(engine::world::World& world, bool withHomePolaroid) const;
+  [[nodiscard]] std::vector<MenuObject> getMainRingObjects(engine::world::World& world) const;
+  [[nodiscard]] std::vector<MenuObject> getKeysRingObjects(engine::world::World& world) const;
 
   ui::Text m_upArrow;
   ui::Text m_downArrow;
@@ -137,4 +127,4 @@ struct MenuDisplay
 
   gslu::nn_shared<gl::ShaderStorageBuffer<engine::ShaderLight>> m_lightsBuffer;
 };
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/menuobject.cpp b/src/menu/menuobject.cpp
index 007d4d5ab..831adbee4 100644
--- a/src/menu/menuobject.cpp
+++ b/src/menu/menuobject.cpp
@@ -28,7 +28,7 @@
 #include <gl/renderstate.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/mat4x4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <initializer_list>
 #include <memory>
@@ -47,8 +47,9 @@ class Mesh;
 
 namespace menu
 {
-bool MenuObject::animate()
+bool MenuObject::tick()
 {
+  // menu runs internally at 60 ticks per second
   for(int i = 0; i < 2; ++i)
   {
     if(meshAnimFrame == goalFrame)
@@ -57,9 +58,9 @@ bool MenuObject::animate()
       return false;
     }
 
-    if(animStretchCounter != 0_frame)
+    if(animStretchCounter != 0_mframe)
     {
-      animStretchCounter -= 1_frame;
+      animStretchCounter -= 1_mframe;
     }
     else
     {
@@ -67,11 +68,11 @@ bool MenuObject::animate()
       meshAnimFrame += animDirection;
       if(meshAnimFrame >= lastMeshAnimFrame)
       {
-        meshAnimFrame = 0_frame;
+        meshAnimFrame = 0_mframe;
       }
-      else if(meshAnimFrame < 0_frame)
+      else if(meshAnimFrame < 0_mframe)
       {
-        meshAnimFrame = lastMeshAnimFrame - 1_frame;
+        meshAnimFrame = lastMeshAnimFrame - 1_mframe;
       }
     }
     updateMeshRenderMask();
@@ -95,32 +96,32 @@ void MenuObject::updateMeshRenderMask()
 
   if(type == engine::TR1ItemId::PassportOpening)
   {
-    if(meshAnimFrame <= 14_frame)
+    if(meshAnimFrame <= 14_mframe)
     {
       setMask(0x57);
     }
-    else if(meshAnimFrame <= 18_frame)
+    else if(meshAnimFrame <= 18_mframe)
     {
       setMask(0x5f);
     }
-    else if(meshAnimFrame == 19_frame)
+    else if(meshAnimFrame == 19_mframe)
     {
       setMask(0x5b);
     }
-    else if(meshAnimFrame <= 23_frame)
+    else if(meshAnimFrame <= 23_mframe)
     {
       setMask(0x7b);
     }
-    else if(meshAnimFrame <= 28_frame)
+    else if(meshAnimFrame <= 28_mframe)
     {
       setMask(0x3b);
     }
-    else if(meshAnimFrame == 29_frame)
+    else if(meshAnimFrame == 29_mframe)
     {
       setMask(0x13);
     }
   }
-  else if(type == engine::TR1ItemId::Compass && (meshAnimFrame == 0_frame || meshAnimFrame >= 18_frame))
+  else if(type == engine::TR1ItemId::Compass && (meshAnimFrame == 0_mframe || meshAnimFrame >= 18_mframe))
   {
     setMask(defaultMeshRenderMask.to_ulong());
   }
@@ -130,13 +131,13 @@ void MenuObject::updateMeshRenderMask()
   }
 }
 
-void MenuObject::initModel(const engine::world::World& world,
+void MenuObject::initModel(engine::world::World& world,
                            const gslu::nn_shared<gl::ShaderStorageBuffer<engine::ShaderLight>>& lights)
 {
   const auto& obj = world.getWorldGeometry().findAnimatedModelForType(type);
   gsl_Assert(obj != nullptr);
   node = std::make_shared<engine::SkeletalModelNode>(
-    "menu-object", gsl::not_null{&world}, gsl::not_null{obj.get()}, false);
+    "menu-object", gsl_lite::not_null{&world}, gsl_lite::not_null{obj.get()}, false);
   node->bind("u_lightAmbient",
              [](const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
              {
@@ -149,7 +150,7 @@ void MenuObject::initModel(const engine::world::World& world,
              {
                shaderStorageBlock.bind(*lights);
              });
-  core::AnimStateId animState{0_as};
+  auto animState{0_as};
   engine::SkeletalModelNode::buildMesh(node, animState);
   node->getRenderable()->getRenderState().setCullFace(true);
   node->getRenderable()->getRenderState().setFrontFace(gl::api::FrontFaceDirection::Cw);
@@ -159,6 +160,7 @@ void MenuObject::draw(const engine::world::World& world,
                       const MenuRingTransform& ringTransform,
                       const core::Angle& ringItemAngle) const
 {
+  // TODO separate tick logic from rendering
   const glm::mat4 nodeMatrix
     = ringTransform.getModelMatrix() * core::TRRotation{0_deg, ringItemAngle, 0_deg}.toMatrix()
       * glm::translate(glm::mat4{1.0f}, core::TRVec{ringTransform.radius, 0_len, 0_len}.toRenderSystem())
@@ -174,8 +176,8 @@ void MenuObject::draw(const engine::world::World& world,
   else if(const auto& obj = world.getWorldGeometry().findAnimatedModelForType(type))
   {
     node->setLocalMatrix(nodeMatrix);
-    core::AnimStateId animState{0_as};
-    node->setAnimation(animState, gsl::not_null{&obj->animations[0]}, meshAnimFrame);
+    auto animState{0_as};
+    node->setAnimation(animState, gsl_lite::not_null{&obj->animations[0]}, meshAnimFrame * 1_frame / 1_mframe);
 
     if(type == engine::TR1ItemId::Compass)
     {
@@ -187,7 +189,7 @@ void MenuObject::draw(const engine::world::World& world,
       node->patchBone(1, core::TRRotation{0_deg, compassNeedleRotation, 0_deg}.toMatrix());
     }
 
-    node->updatePose();
+    node->updateLogicPose(false);
 
     for(const auto translucencySelector : {render::scene::Translucency::Opaque, render::scene::Translucency::NonOpaque})
     {
@@ -204,4 +206,4 @@ void MenuObject::draw(const engine::world::World& world,
     BOOST_LOG_TRIVIAL(error) << "No sprite or model found for " << toString(type);
   }
 }
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/menuobject.h b/src/menu/menuobject.h
index 7cd514876..a09660fdd 100644
--- a/src/menu/menuobject.h
+++ b/src/menu/menuobject.h
@@ -27,8 +27,8 @@ struct MenuObject
 {
   std::string name;
   engine::TR1ItemId type{-1};
-  core::Frame lastMeshAnimFrame;
-  core::Frame openFrame;
+  core::MenuFrame lastMeshAnimFrame;
+  core::MenuFrame openFrame;
   core::Angle selectedBaseRotationX;
   core::Angle selectedRotationX;
   core::Angle selectedRotationY;
@@ -36,11 +36,11 @@ struct MenuObject
   std::bitset<32> defaultMeshRenderMask{0xffffffffull};
   std::bitset<32> meshRenderMask{0xffffffffull};
 
-  core::Frame meshAnimFrame{0_frame};
-  core::Frame goalFrame{0_frame};
-  core::Frame animDirection{1_frame};
-  core::Frame animStretch{1_frame};
-  core::Frame animStretchCounter{0_frame};
+  core::MenuFrame meshAnimFrame{0_mframe};
+  core::MenuFrame goalFrame{0_mframe};
+  core::MenuFrame animDirection{1_mframe};
+  core::MenuFrame animStretch{1_mframe};
+  core::MenuFrame animStretchCounter{0_mframe};
   core::Angle baseRotationX{0_deg};
   core::Angle rotationX{0_deg};
   core::Angle rotationY{0_deg};
@@ -49,10 +49,10 @@ struct MenuObject
   mutable core::Angle compassNeedleRotationMomentum = 0_deg;
 
   std::shared_ptr<engine::SkeletalModelNode> node{nullptr};
-  void initModel(const engine::world::World& world,
+  void initModel(engine::world::World& world,
                  const gslu::nn_shared<gl::ShaderStorageBuffer<engine::ShaderLight>>& lights);
 
-  bool animate();
+  bool tick();
 
   void updateMeshRenderMask();
   void draw(const engine::world::World& world,
diff --git a/src/menu/menuresult.h b/src/menu/menuresult.h
new file mode 100644
index 000000000..afd36cd13
--- /dev/null
+++ b/src/menu/menuresult.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <cstdint>
+
+namespace menu
+{
+enum class MenuResult : uint8_t
+{
+  /// No action requested.
+  None,
+  /// Menu closed by the user.
+  Closed,
+  /// Request to exit to the title screen.
+  ExitToTitle,
+  /// Request to exit the application.
+  ExitGame,
+  /// Request to start a new game (Title -> Level 0, or reset current game).
+  NewGame,
+  /// Request to restart the current level.
+  RestartLevel,
+  /// Request to visit Lara's Home (Gym).
+  LaraHome,
+  /// Request to load a savegame from a slot (see MenuDisplay::requestLoad).
+  RequestLoad,
+  /// Request to jump to a specific level (see MenuDisplay::requestLevelSequenceIndex).
+  RequestLevel
+};
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/menuring.h b/src/menu/menuring.h
index 888ee3d4a..37fe53c01 100644
--- a/src/menu/menuring.h
+++ b/src/menu/menuring.h
@@ -6,7 +6,7 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 #include <utility>
 #include <vector>
@@ -27,7 +27,7 @@ struct MenuRing
   std::vector<MenuObject> list;
   size_t currentObject = 0;
 
-  explicit MenuRing(Type type, std::string title, std::vector<MenuObject> list)
+  explicit MenuRing(const Type type, std::string title, std::vector<MenuObject> list)
       : title{std::move(title)}
       , type{type}
       , list{std::move(list)}
@@ -37,8 +37,8 @@ struct MenuRing
   [[nodiscard]] auto getAnglePerItem() const
   {
     gsl_Expects(!list.empty());
-    const auto anglePerItemDeg = 360.0f / gsl::narrow_cast<float>(list.size());
-    return core::angleFromDegrees(anglePerItemDeg);
+    const auto anglePerItemDeg = 360_fdeg / gsl_lite::narrow_cast<float>(list.size());
+    return core::toAngle(anglePerItemDeg);
   }
 
   MenuObject& getSelectedObject()
@@ -48,7 +48,7 @@ struct MenuRing
 
   [[nodiscard]] core::Angle getCurrentObjectAngle() const
   {
-    return getAnglePerItem() * gsl::narrow_cast<core::Angle::type>(currentObject);
+    return getAnglePerItem() * gsl_lite::narrow_cast<core::Angle::type>(currentObject);
   }
 };
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/menuringtransform.h b/src/menu/menuringtransform.h
index 7a965d5d9..f27734d39 100644
--- a/src/menu/menuringtransform.h
+++ b/src/menu/menuringtransform.h
@@ -12,13 +12,13 @@ namespace menu
 {
 struct MenuRingTransform
 {
-  static const constexpr core::Length CameraZPosOffset = 598_len;
-  static const constexpr core::Length IdleCameraYPosOffset = -240_len;
-  static const constexpr core::Length IdleCameraZPosOffset = 688_len;
-  static const constexpr core::Length CameraBackpackZPos = 3000_len; // original value: 896
-  static const constexpr core::Angle CameraBackpackXRot = 90_deg;
-  static const constexpr core::Angle CameraSwitchRingXRot = 45_deg;
-  static const constexpr core::Length RingOffScreenCameraPosY = 1536_len;
+  static constexpr auto CameraZPosOffset = 598_len;
+  static constexpr core::Length IdleCameraYPosOffset = -240_len;
+  static constexpr auto IdleCameraZPosOffset = 688_len;
+  static constexpr auto CameraBackpackZPos = 3000_len; // original value: 896
+  static constexpr auto CameraBackpackXRot = 90_deg;
+  static constexpr auto CameraSwitchRingXRot = 45_deg;
+  static constexpr auto RingOffScreenCameraPosY = 1536_len;
 
   core::Length radius{0_len};
   core::Angle cameraRotX{CameraBackpackXRot};
@@ -33,8 +33,8 @@ struct MenuRingTransform
   [[nodiscard]] glm::mat4 getView() const
   {
     return glm::lookAt(
-             cameraPos.toRenderSystem(), core::TRVec{0_len, cameraPos.Y, radius}.toRenderSystem(), glm::vec3{0, 1, 0})
-           * glm::eulerAngleX(core::toRad(-cameraRotX));
+             cameraPos.toRenderSystem(), core::TRVec{0_len, cameraPos.Y, radius}.toRenderSystem(), core::RenderAxisUp)
+           * glm::eulerAngleX(core::toRad(-cameraRotX).get<>());
   }
 };
 } // namespace menu
diff --git a/src/menu/menustate.h b/src/menu/menustate.h
index 95d566e4a..dd0730753 100644
--- a/src/menu/menustate.h
+++ b/src/menu/menustate.h
@@ -36,11 +36,12 @@ class MenuState
   virtual void begin(engine::world::World& /*world*/)
   {
   }
-  virtual void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) = 0;
-  virtual std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) = 0;
+  virtual void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) = 0;
+  virtual std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) = 0;
+  virtual void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) = 0;
 
-  template<typename T, typename... Ts>
-  auto create(Ts&&... args) -> std::enable_if_t<std::is_base_of_v<MenuState, T>, std::unique_ptr<T>>
+  template<std::derived_from<MenuState> T, typename... Ts>
+  std::unique_ptr<T> create(Ts&&... args)
   {
     return std::make_unique<T>(m_ringTransform, std::forward<Ts>(args)...);
   }
diff --git a/src/menu/newgamemenustate.cpp b/src/menu/newgamemenustate.cpp
index bf0248feb..f94cbcc74 100644
--- a/src/menu/newgamemenustate.cpp
+++ b/src/menu/newgamemenustate.cpp
@@ -6,7 +6,6 @@
 #include "engine/engine.h"
 #include "engine/world/world.h"
 #include "gameplayrulesmenustate.h"
-#include "gsl/gsl-lite.hpp"
 #include "listdisplaymenustate.h"
 #include "menudisplay.h"
 #include "menuring.h"
@@ -15,6 +14,7 @@
 
 #include <boost/throw_exception.hpp>
 #include <cstddef>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <stdexcept>
 #include <utility>
@@ -28,7 +28,7 @@ NewGameMenuState::NewGameMenuState(const std::shared_ptr<MenuRingTransform>& rin
 {
   auto appendLabel = [this](const std::string& title)
   {
-    append(gsl::make_shared<ui::widgets::Label>(title, ui::widgets::Label::Alignment::Center));
+    append(gsl_lite::make_shared<ui::widgets::Label>(title, ui::widgets::Label::Alignment::Center));
   };
 
   appendLabel(/* translators: TR charmap encoding */ _("New Game"));
@@ -36,7 +36,8 @@ NewGameMenuState::NewGameMenuState(const std::shared_ptr<MenuRingTransform>& rin
   appendLabel(/* translators: TR charmap encoding */ _("Gameplay Rules"));
 }
 
-std::unique_ptr<MenuState> NewGameMenuState::onSelected(size_t idx, engine::world::World& world, MenuDisplay& display)
+std::unique_ptr<MenuState>
+  NewGameMenuState::onSelected(const size_t idx, engine::world::World& world, MenuDisplay& display)
 {
   switch(idx)
   {
@@ -59,4 +60,4 @@ std::unique_ptr<MenuState> NewGameMenuState::onAborted()
 {
   return std::move(m_previous);
 }
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/newgamemenustate.h b/src/menu/newgamemenustate.h
index d0eae00b8..3129f45f0 100644
--- a/src/menu/newgamemenustate.h
+++ b/src/menu/newgamemenustate.h
@@ -7,7 +7,7 @@
 
 namespace menu
 {
-class NewGameMenuState : public ListDisplayMenuState
+class NewGameMenuState final : public ListDisplayMenuState
 {
 public:
   explicit NewGameMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
diff --git a/src/menu/passportmenustate.cpp b/src/menu/passportmenustate.cpp
index ada48448c..aa19b78b3 100644
--- a/src/menu/passportmenustate.cpp
+++ b/src/menu/passportmenustate.cpp
@@ -34,10 +34,7 @@
 
 namespace menu
 {
-void PassportMenuState::handleObject(ui::Ui& /*ui*/,
-                                     engine::world::World& /*world*/,
-                                     MenuDisplay& display,
-                                     MenuObject& object)
+void PassportMenuState::handleObjectTick(engine::world::World& /*world*/, MenuDisplay& display, MenuObject& object)
 {
   if(&object != &display.getCurrentRing().getSelectedObject())
     zeroRotation(object, 256_au);
@@ -55,7 +52,7 @@ std::optional<std::unique_ptr<MenuState>> PassportMenuState::showLoadGamePage(en
     m_passportText = std::make_unique<ui::Text>(title);
   }
 
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     return create<SavegameListMenuState>(std::move(display.m_currentState), title, world, true);
   }
@@ -88,7 +85,7 @@ std::optional<std::unique_ptr<MenuState>> PassportMenuState::showSaveGamePage(en
     m_passportText = std::make_unique<ui::Text>(title);
   }
 
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     switch(m_saveGamePageMode)
     {
@@ -108,7 +105,7 @@ std::optional<std::unique_ptr<MenuState>> PassportMenuState::showSaveGamePage(en
   return std::nullopt;
 }
 
-void PassportMenuState::showExitGamePage(engine::world::World& world, MenuDisplay& display, bool returnToTitle)
+void PassportMenuState::showExitGamePage(engine::world::World& world, MenuDisplay& display, const bool returnToTitle)
 {
   if(m_passportText == nullptr)
   {
@@ -117,16 +114,16 @@ void PassportMenuState::showExitGamePage(engine::world::World& world, MenuDispla
                                                  : /* translators: TR charmap encoding */ _("Exit Game"));
   }
 
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     display.result = returnToTitle ? MenuResult::ExitToTitle : MenuResult::ExitGame;
   }
 }
 
-void PassportMenuState::prevPage(const core::Frame& minFrame, MenuObject& passport, engine::world::World& world)
+void PassportMenuState::prevPage(const core::MenuFrame& minFrame, MenuObject& passport, engine::world::World& world)
 {
   passport.goalFrame -= FramesPerPage;
-  passport.animDirection = -1_frame;
+  passport.animDirection = -1_mframe;
   if(const auto firstFrame = passport.openFrame + minFrame; passport.goalFrame < firstFrame)
   {
     passport.goalFrame = firstFrame;
@@ -141,8 +138,8 @@ void PassportMenuState::prevPage(const core::Frame& minFrame, MenuObject& passpo
 void PassportMenuState::nextPage(MenuObject& passport, engine::world::World& world)
 {
   passport.goalFrame += FramesPerPage;
-  passport.animDirection = 1_frame;
-  if(const auto lastFrame = passport.lastMeshAnimFrame - FramesPerPage - 1_frame; passport.goalFrame > lastFrame)
+  passport.animDirection = 1_mframe;
+  if(const auto lastFrame = passport.lastMeshAnimFrame - FramesPerPage - 1_mframe; passport.goalFrame > lastFrame)
   {
     passport.goalFrame = lastFrame;
   }
@@ -153,20 +150,20 @@ void PassportMenuState::nextPage(MenuObject& passport, engine::world::World& wor
   }
 }
 
-std::unique_ptr<MenuState> PassportMenuState::onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+std::unique_ptr<MenuState> PassportMenuState::tick(engine::world::World& world, MenuDisplay& display)
 {
   auto& passport = display.getCurrentRing().getSelectedObject();
   passport.type = engine::TR1ItemId::PassportOpening;
   passport.initModel(world, display.getLightsBuffer());
 
-  if(passport.selectedRotationY == passport.rotationY && passport.animate())
+  if(passport.selectedRotationY == passport.rotationY && passport.tick())
     return nullptr;
 
   const bool hasSavedGames = world.hasSavedGames();
 
   const auto localFrame = passport.goalFrame - passport.openFrame;
-  hid::AxisMovement forcePageTurn = hid::AxisMovement::Null;
-  if(localFrame % FramesPerPage == 0_frame)
+  auto forcePageTurn = hid::AxisMovement::Null;
+  if(localFrame % FramesPerPage == 0_mframe)
   {
     switch(localFrame / FramesPerPage)
     {
@@ -182,7 +179,7 @@ std::unique_ptr<MenuState> PassportMenuState::onFrame(ui::Ui& ui, engine::world:
     case SaveGamePage:
       if(m_saveGamePageMode == SaveGamePageMode::Skip)
       {
-        if(passport.animDirection == -1_frame)
+        if(passport.animDirection == -1_mframe)
           forcePageTurn = hid::AxisMovement::Left;
         else
           forcePageTurn = hid::AxisMovement::Right;
@@ -199,16 +196,13 @@ std::unique_ptr<MenuState> PassportMenuState::onFrame(ui::Ui& ui, engine::world:
     }
   }
 
-  if(m_passportText != nullptr)
-    m_passportText->draw(
-      ui, world.getPresenter().getTrFont(), {(ui.getSize().x - m_passportText->getWidth()) / 2, ui.getSize().y - 16});
-
   if(forcePageTurn == hid::AxisMovement::Left
-     || world.getPresenter().getInputHandler().getInputState().menuXMovement.justChangedTo(hid::AxisMovement::Left))
+     || world.getEngine().getPresenter().getInputHandler().getInputState().menuXMovement.justChangedTo(
+       hid::AxisMovement::Left))
   {
     if(hasSavedGames)
     {
-      prevPage(0_frame, passport, world);
+      prevPage(0_mframe, passport, world);
       return nullptr;
     }
     else
@@ -221,20 +215,20 @@ std::unique_ptr<MenuState> PassportMenuState::onFrame(ui::Ui& ui, engine::world:
     }
   }
   else if(forcePageTurn == hid::AxisMovement::Right
-          || world.getPresenter().getInputHandler().getInputState().menuXMovement.justChangedTo(
+          || world.getEngine().getPresenter().getInputHandler().getInputState().menuXMovement.justChangedTo(
             hid::AxisMovement::Right))
   {
     nextPage(passport, world);
     return nullptr;
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
   {
     if(!m_allowExit && display.mode != InventoryMode::TitleMode)
       return nullptr;
 
     return create<ClosePassportMenuState>(passport, create<IdleRingMenuState>(false));
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     return create<ClosePassportMenuState>(passport, create<IdleRingMenuState>(false));
   }
@@ -242,9 +236,17 @@ std::unique_ptr<MenuState> PassportMenuState::onFrame(ui::Ui& ui, engine::world:
   return nullptr;
 }
 
+void PassportMenuState::constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+{
+  if(m_passportText != nullptr)
+    m_passportText->draw(ui,
+                         world.getEngine().getPresenter().getTrFont(),
+                         {(ui.getSize().x - m_passportText->getWidth()) / 2, ui.getSize().y - 16});
+}
+
 PassportMenuState::PassportMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
-                                     bool allowExit,
-                                     SaveGamePageMode saveGamePageMode)
+                                     const bool allowExit,
+                                     const SaveGamePageMode saveGamePageMode)
     : MenuState{ringTransform}
     , m_allowExit{allowExit}
     , m_saveGamePageMode{saveGamePageMode}
diff --git a/src/menu/passportmenustate.h b/src/menu/passportmenustate.h
index cb9d5f40b..6bb2adb64 100644
--- a/src/menu/passportmenustate.h
+++ b/src/menu/passportmenustate.h
@@ -28,7 +28,6 @@ enum class SaveGamePageMode : uint8_t;
 
 class PassportMenuState : public MenuState
 {
-private:
   bool m_allowExit;
   SaveGamePageMode m_saveGamePageMode;
   std::unique_ptr<ui::Text> m_passportText;
@@ -36,20 +35,21 @@ class PassportMenuState : public MenuState
   std::optional<std::unique_ptr<MenuState>> showLoadGamePage(engine::world::World& world, MenuDisplay& display);
   std::optional<std::unique_ptr<MenuState>> showSaveGamePage(engine::world::World& world, MenuDisplay& display);
   void showExitGamePage(engine::world::World& world, MenuDisplay& display, bool returnToTitle);
-  void prevPage(const core::Frame& minFrame, MenuObject& passport, engine::world::World& world);
+  void prevPage(const core::MenuFrame& minFrame, MenuObject& passport, engine::world::World& world);
   void nextPage(MenuObject& passport, engine::world::World& world);
 
 public:
   static constexpr int LoadGamePage = 0;
   static constexpr int SaveGamePage = 1;
   static constexpr int ExitGamePage = 2;
-  static constexpr core::Frame FramesPerPage = 5_frame;
+  static constexpr auto FramesPerPage = 5_mframe;
 
   explicit PassportMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
                              bool allowExit,
                              SaveGamePageMode saveGamePageMode);
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/requestlevelmenustate.cpp b/src/menu/requestlevelmenustate.cpp
index 2ed3bcfe2..110c8e436 100644
--- a/src/menu/requestlevelmenustate.cpp
+++ b/src/menu/requestlevelmenustate.cpp
@@ -8,19 +8,20 @@ namespace menu
 {
 class MenuState;
 
-void RequestLevelMenuState::handleObject(ui::Ui& /*ui*/,
-                                         engine::world::World& /*world*/,
-                                         MenuDisplay& /*display*/,
-                                         MenuObject& /*object*/)
+void RequestLevelMenuState::handleObjectTick(engine::world::World& /*world*/,
+                                             MenuDisplay& /*display*/,
+                                             MenuObject& /*object*/)
 {
 }
 
-std::unique_ptr<MenuState>
-  RequestLevelMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& display)
+std::unique_ptr<MenuState> RequestLevelMenuState::tick(engine::world::World& /*world*/, MenuDisplay& display)
 {
   display.requestLevelSequenceIndex = m_sequenceIndex;
   display.result = MenuResult::RequestLevel;
   return nullptr;
 }
 
+void RequestLevelMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
 } // namespace menu
diff --git a/src/menu/requestlevelmenustate.h b/src/menu/requestlevelmenustate.h
index 19da241af..f6d6b783f 100644
--- a/src/menu/requestlevelmenustate.h
+++ b/src/menu/requestlevelmenustate.h
@@ -23,17 +23,18 @@ struct MenuDisplay;
 struct MenuObject;
 struct MenuRingTransform;
 
-class RequestLevelMenuState : public MenuState
+class RequestLevelMenuState final : public MenuState
 {
 public:
-  explicit RequestLevelMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform, size_t sequenceIndex)
+  explicit RequestLevelMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform, const size_t sequenceIndex)
       : MenuState{ringTransform}
       , m_sequenceIndex{sequenceIndex}
   {
   }
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 
 private:
   size_t m_sequenceIndex;
diff --git a/src/menu/requestloadmenustate.cpp b/src/menu/requestloadmenustate.cpp
index 49c335624..2180349a2 100644
--- a/src/menu/requestloadmenustate.cpp
+++ b/src/menu/requestloadmenustate.cpp
@@ -8,19 +8,20 @@ namespace menu
 {
 class MenuState;
 
-void RequestLoadMenuState::handleObject(ui::Ui& /*ui*/,
-                                        engine::world::World& /*world*/,
-                                        MenuDisplay& /*display*/,
-                                        MenuObject& /*object*/)
+void RequestLoadMenuState::handleObjectTick(engine::world::World& /*world*/,
+                                            MenuDisplay& /*display*/,
+                                            MenuObject& /*object*/)
 {
 }
 
-std::unique_ptr<MenuState>
-  RequestLoadMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& display)
+std::unique_ptr<MenuState> RequestLoadMenuState::tick(engine::world::World& /*world*/, MenuDisplay& display)
 {
   display.requestLoad = m_slot;
   display.result = MenuResult::RequestLoad;
   return nullptr;
 }
 
+void RequestLoadMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
 } // namespace menu
diff --git a/src/menu/requestloadmenustate.h b/src/menu/requestloadmenustate.h
index 665d02787..a3e519c3c 100644
--- a/src/menu/requestloadmenustate.h
+++ b/src/menu/requestloadmenustate.h
@@ -34,8 +34,9 @@ class RequestLoadMenuState : public MenuState
   {
   }
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 
 private:
   std::optional<size_t> m_slot;
diff --git a/src/menu/resetitemtransformmenustate.cpp b/src/menu/resetitemtransformmenustate.cpp
index f95929571..c423ee917 100644
--- a/src/menu/resetitemtransformmenustate.cpp
+++ b/src/menu/resetitemtransformmenustate.cpp
@@ -15,10 +15,9 @@
 
 namespace menu
 {
-void ResetItemTransformMenuState::handleObject(ui::Ui& /*ui*/,
-                                               engine::world::World& /*world*/,
-                                               MenuDisplay& display,
-                                               MenuObject& object)
+void ResetItemTransformMenuState::handleObjectTick(engine::world::World& /*world*/,
+                                                   MenuDisplay& display,
+                                                   MenuObject& object)
 {
   if(&object == &display.getCurrentRing().getSelectedObject())
   {
@@ -32,18 +31,21 @@ void ResetItemTransformMenuState::handleObject(ui::Ui& /*ui*/,
   }
 }
 
-std::unique_ptr<MenuState>
-  ResetItemTransformMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+std::unique_ptr<MenuState> ResetItemTransformMenuState::tick(engine::world::World& /*world*/, MenuDisplay& /*display*/)
 {
-  if(m_duration != 0_frame)
+  if(m_duration != 0_tick)
   {
-    m_duration -= 1_frame;
+    m_duration -= 1_tick;
     return nullptr;
   }
 
   return std::move(m_next);
 }
 
+void ResetItemTransformMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
+
 void ResetItemTransformMenuState::begin(engine::world::World& world)
 {
   world.getAudioEngine().playSoundEffect(engine::TR1SoundEffect::MenuOptionEscape, nullptr);
diff --git a/src/menu/resetitemtransformmenustate.h b/src/menu/resetitemtransformmenustate.h
index 17f0d20d7..70fe13211 100644
--- a/src/menu/resetitemtransformmenustate.h
+++ b/src/menu/resetitemtransformmenustate.h
@@ -23,11 +23,10 @@ struct MenuDisplay;
 struct MenuObject;
 struct MenuRingTransform;
 
-class ResetItemTransformMenuState : public MenuState
+class ResetItemTransformMenuState final : public MenuState
 {
-private:
-  static constexpr core::Frame Duration = 16_frame / 2;
-  core::Frame m_duration{Duration};
+  static constexpr core::Tick Duration = 16_tick / 2;
+  core::Tick m_duration{Duration};
   std::unique_ptr<MenuState> m_next;
 
 public:
@@ -38,8 +37,9 @@ class ResetItemTransformMenuState : public MenuState
   {
   }
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
   void begin(engine::world::World& world) override;
 };
 } // namespace menu
diff --git a/src/menu/rotateleftrightmenustate.cpp b/src/menu/rotateleftrightmenustate.cpp
index 4dd90b2f5..f549adeb1 100644
--- a/src/menu/rotateleftrightmenustate.cpp
+++ b/src/menu/rotateleftrightmenustate.cpp
@@ -14,21 +14,20 @@
 
 namespace menu
 {
-void RotateLeftRightMenuState::handleObject(ui::Ui& /*ui*/,
-                                            engine::world::World& /*world*/,
-                                            MenuDisplay& /*display*/,
-                                            MenuObject& object)
+void RotateLeftRightMenuState::handleObjectTick(engine::world::World& /*world*/,
+                                                MenuDisplay& /*display*/,
+                                                MenuObject& object)
 {
   zeroRotation(object, 512_au);
 }
 
 RotateLeftRightMenuState::RotateLeftRightMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
-                                                   bool left,
+                                                   const bool left,
                                                    const MenuRing& ring,
                                                    std::unique_ptr<MenuState>&& prev)
     : MenuState{ringTransform}
     , m_targetObject{ring.currentObject + (left ? -1 : 1)}
-    , m_rotSpeed{(left ? -ring.getAnglePerItem() : ring.getAnglePerItem()) / Duration}
+    , m_rotSpeed{(left ? -ring.getAnglePerItem() : ring.getAnglePerItem()) / Duration / 1_frame * 1_tick}
     , m_prev{std::move(prev)}
 {
   if(m_targetObject == std::numeric_limits<size_t>::max())
@@ -41,16 +40,19 @@ RotateLeftRightMenuState::RotateLeftRightMenuState(const std::shared_ptr<MenuRin
   }
 }
 
-std::unique_ptr<MenuState>
-  RotateLeftRightMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& display)
+std::unique_ptr<MenuState> RotateLeftRightMenuState::tick(engine::world::World& /*world*/, MenuDisplay& display)
 {
   m_ringTransform->ringRotation += m_rotSpeed * 1_frame;
-  m_duration -= 1_frame;
-  if(m_duration != 0_frame)
+  m_duration -= 1_tick;
+  if(m_duration != 0_tick)
     return nullptr;
 
   display.getCurrentRing().currentObject = m_targetObject;
   m_ringTransform->ringRotation = display.getCurrentRing().getCurrentObjectAngle();
   return std::move(m_prev);
 }
+
+void RotateLeftRightMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
 } // namespace menu
diff --git a/src/menu/rotateleftrightmenustate.h b/src/menu/rotateleftrightmenustate.h
index 7506538f1..50c5ddfd5 100644
--- a/src/menu/rotateleftrightmenustate.h
+++ b/src/menu/rotateleftrightmenustate.h
@@ -24,12 +24,11 @@ struct MenuDisplay;
 struct MenuObject;
 struct MenuRingTransform;
 
-class RotateLeftRightMenuState : public MenuState
+class RotateLeftRightMenuState final : public MenuState
 {
-private:
-  static constexpr core::Frame Duration = 24_frame / 2;
+  static constexpr core::Tick Duration = 24_tick / 2;
   size_t m_targetObject{0};
-  core::Frame m_duration{Duration};
+  core::Tick m_duration{Duration};
   // cppcheck-suppress syntaxError
   core::RotationSpeed m_rotSpeed;
   std::unique_ptr<MenuState> m_prev;
@@ -40,7 +39,8 @@ class RotateLeftRightMenuState : public MenuState
                                     const MenuRing& ring,
                                     std::unique_ptr<MenuState>&& prev);
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/savegamecleanup.cpp b/src/menu/savegamecleanup.cpp
index 12acd9998..7223fcb26 100644
--- a/src/menu/savegamecleanup.cpp
+++ b/src/menu/savegamecleanup.cpp
@@ -11,6 +11,7 @@
 #include <iterator>
 #include <map>
 #include <optional>
+#include <ranges>
 #include <system_error>
 #include <vector>
 
@@ -34,7 +35,7 @@ struct PathLess
 
 void renameToTmpFiles(const engine::Engine& engine, const std::map<size_t, engine::SavegameInfo>& savegameInfos)
 {
-  for(const auto& [slot, info] : savegameInfos)
+  for(const auto& slot : savegameInfos | std::views::keys)
   {
     const auto path = engine.getSavegamePath(slot);
     const auto metaPath = engine::makeMetaFilepath(path);
@@ -52,22 +53,20 @@ void orderBy(const engine::Engine& engine,
 
   // then get a list of all used slots
   std::vector<size_t> currentSlots;
-  std::transform(savegameInfos.begin(),
-                 savegameInfos.end(),
-                 std::back_inserter(currentSlots),
-                 [](const auto& slotAndInfo)
-                 {
-                   return slotAndInfo.first;
-                 });
+  std::ranges::transform(savegameInfos,
+                         std::back_inserter(currentSlots),
+                         [](const auto& slotAndInfo)
+                         {
+                           return slotAndInfo.first;
+                         });
 
   // now order the slots according to the predicate
   auto orderedSlots = currentSlots;
-  std::stable_sort(orderedSlots.begin(),
-                   orderedSlots.end(),
-                   [&savegameInfos, &predicate](auto slotA, auto slotB)
-                   {
-                     return predicate(savegameInfos.at(slotA), savegameInfos.at(slotB));
-                   });
+  std::ranges::stable_sort(orderedSlots,
+                           [&savegameInfos, &predicate](auto slotA, auto slotB)
+                           {
+                             return predicate(savegameInfos.at(slotA), savegameInfos.at(slotB));
+                           });
 
   // now rename the temporary saves to the ordinary saves while getting re-ordered
   for(size_t i = 0; i < currentSlots.size(); ++i)
@@ -94,9 +93,9 @@ void deleteSave(const engine::Engine& engine, size_t slot)
 
 void deleteSavesExcept(const engine::Engine& engine,
                        const std::map<size_t, engine::SavegameInfo>& savegameInfos,
-                       size_t slot)
+                       const size_t slot)
 {
-  for(const auto& [n, info] : savegameInfos)
+  for(const auto& n : savegameInfos | std::views::keys)
   {
     if(n != slot)
     {
@@ -124,7 +123,7 @@ size_t compactSaves(const engine::Engine& engine,
 {
   size_t dstSlot = 0;
   size_t newSelectedSlot = 0;
-  for(const auto& [srcSlot, info] : savegameInfos)
+  for(const auto& srcSlot : savegameInfos | std::views::keys)
   {
     const auto srcPath = engine.getSavegamePath(srcSlot);
     const auto srcMetaPath = engine::makeMetaFilepath(srcPath);
@@ -155,8 +154,7 @@ void deleteSavesPerLevelExceptNewest(const engine::Engine& engine,
   std::map<std::filesystem::path, SlotTimestamp, PathLess> newestPerLevel;
   for(const auto& [slot, savegameInfo] : savegameInfos)
   {
-    const auto it = newestPerLevel.find(savegameInfo.meta.filename);
-    if(it == newestPerLevel.end())
+    if(const auto it = newestPerLevel.find(savegameInfo.meta.filename); it == newestPerLevel.end())
     {
       newestPerLevel.emplace(savegameInfo.meta.filename, SlotTimestamp{slot, savegameInfo.saveTime});
     }
diff --git a/src/menu/savegamelistmenustate.cpp b/src/menu/savegamelistmenustate.cpp
index b23280816..3f9299354 100644
--- a/src/menu/savegamelistmenustate.cpp
+++ b/src/menu/savegamelistmenustate.cpp
@@ -38,7 +38,7 @@
 #include <ctime>
 #include <filesystem>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 #include <memory>
@@ -68,12 +68,12 @@ class SavegameListMenuState::CleanupWidget final : public ui::widgets::Widget
 {
 public:
   explicit CleanupWidget(const std::optional<std::string>& slotDate)
-      : ui::widgets::Widget{}
+      : Widget{}
       , m_referenceDate{slotDate}
   {
     createList();
-    m_container = std::make_shared<ui::widgets::GroupBox>(/* translators: TR charmap encoding */ _("Clean Up Saves"),
-                                                          gsl::not_null{m_list});
+    m_container = std::make_shared<ui::widgets::GroupBox>(
+      /* translators: TR charmap encoding */ _("Clean Up Saves"), gsl_lite::not_null{m_list});
     fitToContent();
   }
 
@@ -109,12 +109,12 @@ class SavegameListMenuState::CleanupWidget final : public ui::widgets::Widget
     m_container->setSize(size);
   }
 
-  void update(bool hasFocus) override
+  void tick(const bool hasFocus) override
   {
-    m_container->update(hasFocus);
+    m_container->tick(hasFocus);
   }
 
-  void fitToContent() final
+  void fitToContent() override
   {
     m_container->fitToContent();
   }
@@ -137,44 +137,44 @@ class SavegameListMenuState::CleanupWidget final : public ui::widgets::Widget
 private:
   void createList()
   {
-    m_list = gsl::make_shared<ui::widgets::ListBox>();
+    m_list = gsl_lite::make_shared<ui::widgets::ListBox>();
     if(m_referenceDate.has_value())
     {
       m_actionPerListItem.emplace_back(CleanupAction::Current);
-      m_list->append(
-        gsl::make_shared<ui::widgets::Label>(/* translators: TR charmap encoding */ _("Clear Selected Slot")));
+      m_list->append(gsl_lite::make_shared<ui::widgets::Label>(
+        /* translators: TR charmap encoding */ _("Clear Selected Slot")));
 
       m_actionPerListItem.emplace_back(CleanupAction::BeforeDate);
-      m_list->append(gsl::make_shared<ui::widgets::Label>(
+      m_list->append(gsl_lite::make_shared<ui::widgets::Label>(
         /* translators: TR charmap encoding */ _("Clear Slots Before %1%", *m_referenceDate)));
 
       m_actionPerListItem.emplace_back(CleanupAction::AllOther);
-      m_list->append(gsl::make_shared<ui::widgets::Label>(
+      m_list->append(gsl_lite::make_shared<ui::widgets::Label>(
         /* translators: TR charmap encoding */ _("Clear All Other Slots")));
 
       m_actionPerListItem.emplace_back(CleanupAction::AllOtherForLevel);
-      m_list->append(gsl::make_shared<ui::widgets::Label>(
+      m_list->append(gsl_lite::make_shared<ui::widgets::Label>(
         /* translators: TR charmap encoding */ _("Clear All Other Level Slots")));
     }
 
     m_actionPerListItem.emplace_back(CleanupAction::AllExceptNewestPerLevel);
-    m_list->append(gsl::make_shared<ui::widgets::Label>(
+    m_list->append(gsl_lite::make_shared<ui::widgets::Label>(
       /* translators: TR charmap encoding */ _("Clear All Slots, Keep Most Recent Level Slots, and Compact")));
 
     m_actionPerListItem.emplace_back(CleanupAction::Compact);
-    m_list->append(gsl::make_shared<ui::widgets::Label>(
+    m_list->append(gsl_lite::make_shared<ui::widgets::Label>(
       /* translators: TR charmap encoding */ _("Compact")));
 
     m_actionPerListItem.emplace_back(CleanupAction::OrderByDateAndCompact);
-    m_list->append(gsl::make_shared<ui::widgets::Label>(
+    m_list->append(gsl_lite::make_shared<ui::widgets::Label>(
       /* translators: TR charmap encoding */ _("Order by Date and Compact")));
 
     m_actionPerListItem.emplace_back(CleanupAction::OrderByDateLevelAndCompact);
-    m_list->append(gsl::make_shared<ui::widgets::Label>(
+    m_list->append(gsl_lite::make_shared<ui::widgets::Label>(
       /* translators: TR charmap encoding */ _("Group by Level, Order by Date, and Compact")));
 
     m_actionPerListItem.emplace_back(CleanupAction::Cancel);
-    m_list->append(gsl::make_shared<ui::widgets::Label>(
+    m_list->append(gsl_lite::make_shared<ui::widgets::Label>(
       /* translators: TR charmap encoding */ _("Cancel")));
 
     m_list->fitToContent();
@@ -220,9 +220,9 @@ class SavegameListMenuState::SavegameEntry final : public ui::widgets::Widget
     m_label.setSize(size);
   }
 
-  void update(bool hasFocus) override
+  void tick(const bool hasFocus) override
   {
-    m_label.update(hasFocus);
+    m_label.tick(hasFocus);
   }
 
   void fitToContent() override
@@ -261,7 +261,7 @@ SavegameListMenuState::SavegameListMenuState(const std::shared_ptr<MenuRingTrans
                                              std::unique_ptr<MenuState> previous,
                                              const std::string& heading,
                                              const engine::world::World& world,
-                                             bool loading)
+                                             const bool loading)
     : ListDisplayMenuState{ringTransform, heading, 10}
     , m_previous{std::move(previous)}
     , m_loading{loading}
@@ -279,9 +279,14 @@ SavegameListMenuState::SavegameListMenuState(const std::shared_ptr<MenuRingTrans
 }
 
 std::unique_ptr<MenuState>
-  SavegameListMenuState::onSelected(size_t selectedIdx, engine::world::World& world, MenuDisplay& display)
+  SavegameListMenuState::onSelected(const size_t selectedIdx, engine::world::World& world, MenuDisplay& display)
 {
-  if(m_loading && world.getEngine().getGameplayRules().noMeds)
+  if(m_loading
+     && world
+
+          .getEngine()
+          .getGameplayRules()
+          .noMeds)
   {
     world.getObjectManager().getLara().playSoundEffect(engine::TR1SoundEffect::LaraNo);
     return nullptr;
@@ -322,20 +327,39 @@ std::unique_ptr<MenuState> SavegameListMenuState::onAborted()
   return std::move(m_previous);
 }
 
-std::unique_ptr<MenuState> SavegameListMenuState::onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+std::unique_ptr<MenuState> SavegameListMenuState::tick(engine::world::World& world, MenuDisplay& display)
 {
   if(m_overwriteConfirmation == nullptr && m_cleanupWidget == nullptr)
   {
-    return onDefaultFrame(ui, world, display);
+    return onDefaultTick(world, display);
+  }
+  else if(m_overwriteConfirmation != nullptr)
+  {
+    return onConfirmOverwriteTick(world, display);
+  }
+  else if(m_cleanupWidget != nullptr)
+  {
+    return onCleanupTick(world, display);
   }
+  else
+  {
+    BOOST_THROW_EXCEPTION(std::runtime_error("invalid savegame list menu state"));
+  }
+}
 
-  if(m_overwriteConfirmation != nullptr)
+void SavegameListMenuState::constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+{
+  if(m_overwriteConfirmation == nullptr && m_cleanupWidget == nullptr)
   {
-    return onConfirmOverwriteFrame(ui, world, display);
+    onDefaultDraw(ui, world, display);
+  }
+  else if(m_overwriteConfirmation != nullptr)
+  {
+    onConfirmOverwriteDraw(ui, world, display);
   }
   else if(m_cleanupWidget != nullptr)
   {
-    return onCleanupFrame(ui, world, display);
+    onCleanupDraw(ui, world, display);
   }
   else
   {
@@ -347,49 +371,47 @@ void SavegameListMenuState::sortEntries()
 {
   clear();
 
-  std::sort(m_entries.begin(),
-            m_entries.end(),
-            [this](const auto& lhs, const auto& rhs)
-            {
-              const auto& lhsT = lhs->getTime();
-              const auto& rhsT = rhs->getTime();
-              switch(m_ordering)
-              {
-              case Ordering::Slot:
-                break;
-              case Ordering::DateAsc:
-                if(!lhsT.has_value() && !rhsT.has_value())
-                  break;
-                else if(lhsT.has_value() && !rhsT.has_value())
-                  return true;
-                else if(!lhsT.has_value() && rhsT.has_value())
-                  return false;
-                else if(*lhsT != *rhsT)
-                  return *lhsT < *rhsT;
-                break;
-              case Ordering::DateDesc:
-                if(!lhsT.has_value() && !rhsT.has_value())
-                  break;
-                else if(lhsT.has_value() && !rhsT.has_value())
-                  return true;
-                else if(!lhsT.has_value() && rhsT.has_value())
-                  return false;
-                else if(*lhsT != *rhsT)
-                  return *lhsT > *rhsT;
-                break;
-              }
-
-              return lhs->getSlot() < rhs->getSlot();
-            });
+  std::ranges::sort(m_entries,
+                    [this](const auto& lhs, const auto& rhs)
+                    {
+                      const auto& lhsT = lhs->getTime();
+                      const auto& rhsT = rhs->getTime();
+                      switch(m_ordering)
+                      {
+                      case Ordering::Slot:
+                        break;
+                      case Ordering::DateAsc:
+                        if(!lhsT.has_value() && !rhsT.has_value())
+                          break;
+                        else if(lhsT.has_value() && !rhsT.has_value())
+                          return true;
+                        else if(!lhsT.has_value() && rhsT.has_value())
+                          return false;
+                        else if(*lhsT != *rhsT)
+                          return *lhsT < *rhsT;
+                        break;
+                      case Ordering::DateDesc:
+                        if(!lhsT.has_value() && !rhsT.has_value())
+                          break;
+                        else if(lhsT.has_value() && !rhsT.has_value())
+                          return true;
+                        else if(!lhsT.has_value() && rhsT.has_value())
+                          return false;
+                        else if(*lhsT != *rhsT)
+                          return *lhsT > *rhsT;
+                        break;
+                      }
+
+                      return lhs->getSlot() < rhs->getSlot();
+                    });
 
   for(const auto& entry : m_entries)
     append(entry);
 }
 
-std::unique_ptr<MenuState>
-  SavegameListMenuState::onDefaultFrame(ui::Ui& ui, engine::world::World& world, menu::MenuDisplay& display)
+std::unique_ptr<MenuState> SavegameListMenuState::onDefaultTick(engine::world::World& world, MenuDisplay& display)
 {
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrevScreen))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrevScreen))
   {
     switch(m_ordering)
     {
@@ -405,7 +427,7 @@ std::unique_ptr<MenuState>
     }
     sortEntries();
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::NextScreen))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::NextScreen))
   {
     switch(m_ordering)
     {
@@ -421,12 +443,11 @@ std::unique_ptr<MenuState>
     }
     sortEntries();
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::SecondaryInteraction))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::SecondaryInteraction))
   {
     const auto slot = m_entries.at(getListBox()->getSelected())->getSlot();
     if(!slot.has_value())
     {
-      draw(ui, world, display);
       // don't allow management using the quicksave slot
       return nullptr;
     }
@@ -437,30 +458,29 @@ std::unique_ptr<MenuState>
       saveTime = util::toSavegameTime(it->second.saveTime, world.getEngine().getLocale());
     }
     m_cleanupWidget = std::make_shared<CleanupWidget>(saveTime);
-    draw(ui, world, display);
     return nullptr;
   }
 
-  return ListDisplayMenuState::onFrame(ui, world, display);
+  return ListDisplayMenuState::tick(world, display);
 }
 
-std::unique_ptr<MenuState>
-  SavegameListMenuState::onConfirmOverwriteFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+void SavegameListMenuState::onDefaultDraw(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
 {
-  draw(ui, world, display);
-  m_overwriteConfirmation->fitToContent();
-  m_overwriteConfirmation->setPosition({(ui.getSize().x - m_overwriteConfirmation->getSize().x) / 2,
-                                        ui.getSize().y - m_overwriteConfirmation->getSize().y - 90});
+  ListDisplayMenuState::constructUi(ui, world, display);
+}
 
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuLeft)
-     || world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuRight))
+std::unique_ptr<MenuState> SavegameListMenuState::onConfirmOverwriteTick(engine::world::World& world,
+                                                                         MenuDisplay& display)
+{
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuLeft)
+     || world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuRight))
   {
     m_overwriteConfirmation->toggleConfirmed();
   }
-  else if(world.getPresenter().getInputHandler().hasAction(hid::Action::PrimaryInteraction))
+  else if(world.getEngine().getPresenter().getInputHandler().hasAction(hid::Action::PrimaryInteraction))
   {
     const auto justConfirmed
-      = world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction);
+      = world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction);
     if(justConfirmed && !m_overwriteConfirmation->isConfirmed())
     {
       m_overwriteConfirmation.reset();
@@ -488,37 +508,34 @@ std::unique_ptr<MenuState>
     m_confirmOverwritePressedSince = std::chrono::steady_clock::now();
   }
 
-  m_overwriteConfirmation->update(true);
-  m_overwriteConfirmation->draw(ui, world.getPresenter());
+  m_overwriteConfirmation->tick(true);
   return nullptr;
 }
 
-std::unique_ptr<MenuState>
-  SavegameListMenuState::onCleanupFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+void SavegameListMenuState::onConfirmOverwriteDraw(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
 {
-  draw(ui, world, display);
-  m_cleanupWidget->fitToContent();
-  m_cleanupWidget->setPosition(
-    {(ui.getSize().x - m_cleanupWidget->getSize().x) / 2, ui.getSize().y - m_cleanupWidget->getSize().y - 90});
-  m_cleanupWidget->draw(ui, world.getPresenter());
+  constructUi(ui, world, display);
+  m_overwriteConfirmation->fitToContent();
+  m_overwriteConfirmation->setPosition({(ui.getSize().x - m_overwriteConfirmation->getSize().x) / 2,
+                                        ui.getSize().y - m_overwriteConfirmation->getSize().y - 90});
+  m_overwriteConfirmation->draw(ui, world.getEngine().getPresenter());
+}
 
+std::unique_ptr<MenuState> SavegameListMenuState::onCleanupTick(engine::world::World& world, MenuDisplay& /*display*/)
+{
   if(m_cleanupConfirmation != nullptr)
   {
-    m_cleanupConfirmation->fitToContent();
-    m_cleanupConfirmation->setPosition({(ui.getSize().x - m_cleanupConfirmation->getSize().x) / 2,
-                                        ui.getSize().y - m_cleanupConfirmation->getSize().y - 90});
-    m_cleanupConfirmation->update(true);
-    m_cleanupConfirmation->draw(ui, world.getPresenter());
-    if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
+    m_cleanupConfirmation->tick(true);
+    if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
     {
       m_cleanupConfirmation.reset();
     }
-    else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuLeft)
-            || world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuRight))
+    else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuLeft)
+            || world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuRight))
     {
       m_cleanupConfirmation->toggleConfirmed();
     }
-    else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+    else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
     {
       if(!m_cleanupConfirmation->isConfirmed())
       {
@@ -534,30 +551,49 @@ std::unique_ptr<MenuState>
     return nullptr;
   }
 
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
   {
     m_cleanupWidget.reset();
     return nullptr;
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuUp))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuUp))
   {
     m_cleanupWidget->prevEntry();
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuDown))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuDown))
   {
     m_cleanupWidget->nextEntry();
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     initCleanupConfirmation();
     return nullptr;
   }
 
-  m_cleanupWidget->update(true);
-  m_cleanupWidget->draw(ui, world.getPresenter());
+  m_cleanupWidget->tick(true);
   return nullptr;
 }
 
+void SavegameListMenuState::onCleanupDraw(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+{
+  constructUi(ui, world, display);
+  m_cleanupWidget->fitToContent();
+  m_cleanupWidget->setPosition(
+    {(ui.getSize().x - m_cleanupWidget->getSize().x) / 2, ui.getSize().y - m_cleanupWidget->getSize().y - 90});
+  m_cleanupWidget->draw(ui, world.getEngine().getPresenter());
+
+  if(m_cleanupConfirmation != nullptr)
+  {
+    m_cleanupConfirmation->fitToContent();
+    m_cleanupConfirmation->setPosition({(ui.getSize().x - m_cleanupConfirmation->getSize().x) / 2,
+                                        ui.getSize().y - m_cleanupConfirmation->getSize().y - 90});
+    m_cleanupConfirmation->tick(true);
+    m_cleanupConfirmation->draw(ui, world.getEngine().getPresenter());
+  }
+
+  m_cleanupWidget->draw(ui, world.getEngine().getPresenter());
+}
+
 void SavegameListMenuState::selectMostRecentSlot()
 {
   std::filesystem::file_time_type mostRecentTime = std::filesystem::file_time_type::min();
@@ -620,12 +656,11 @@ void SavegameListMenuState::updateSavegameInfos(const engine::world::World& worl
     std::string levelTitle;
     if(slot.has_value())
     {
-      const auto titlesIt = std::find_if(levelFilepathsTitles.cbegin(),
-                                         levelFilepathsTitles.cend(),
-                                         [&info](const auto& entry)
-                                         {
-                                           return util::preferredEqual(entry.first, info.meta.filename);
-                                         });
+      const auto titlesIt = std::ranges::find_if(levelFilepathsTitles,
+                                                 [&info](const auto& entry)
+                                                 {
+                                                   return util::preferredEqual(entry.first, info.meta.filename);
+                                                 });
       gsl_Assert(titlesIt != levelFilepathsTitles.cend());
       auto titleIt = titlesIt->second.find(world.getEngine().getLocaleWithoutEncoding());
       if(titleIt == titlesIt->second.end())
@@ -639,10 +674,11 @@ void SavegameListMenuState::updateSavegameInfos(const engine::world::World& worl
     {
       levelTitle = /* translators: TR charmap encoding */ pgettext("SavegameTitle", "Quicksave");
     }
-    const auto title = (boost::format(/* translators: TR charmap encoding */ pgettext("SavegameTitle", "%1% - %2%"))
+    const auto title = (boost::format(
+                          /* translators: TR charmap encoding */ pgettext("SavegameTitle", "%1% - %2%"))
                         % timeStr % levelTitle)
                          .str();
-    const auto entry = gsl::make_shared<SavegameEntry>(slot, title, levelTitle, info.saveTime);
+    const auto entry = gsl_lite::make_shared<SavegameEntry>(slot, title, levelTitle, info.saveTime);
     append(entry);
     m_entries.emplace_back(entry);
   };
@@ -653,7 +689,7 @@ void SavegameListMenuState::updateSavegameInfos(const engine::world::World& worl
   }
   else
   {
-    const auto entry = gsl::make_shared<SavegameEntry>(
+    const auto entry = gsl_lite::make_shared<SavegameEntry>(
       std::nullopt,
       /* translators: TR charmap encoding */ pgettext("SavegameTitle", "- NO QUICKSAVE"),
       std::string{},
@@ -671,7 +707,7 @@ void SavegameListMenuState::updateSavegameInfos(const engine::world::World& worl
     }
     else
     {
-      auto label = gsl::make_shared<SavegameEntry>(
+      auto label = gsl_lite::make_shared<SavegameEntry>(
         slot,
         /* translators: TR charmap encoding */ pgettext("SavegameTitle", "- EMPTY SLOT %1%", slot + 1),
         std::string{},
@@ -752,12 +788,12 @@ void SavegameListMenuState::initCleanupConfirmation()
       MaxTextWidth));
     break;
   case CleanupAction::OrderByDateLevelAndCompact:
-    m_cleanupConfirmation = std::make_shared<ui::widgets::MessageBox>(
-      ui::breakLines(/* translators: TR charmap encoding */ _("Order by Level and Date and Compact All Slots?\n\n"
-                                                              "This will order your saves by level,"
-                                                              " then by date, and move all slots"
-                                                              " to the start of the list."),
-                     MaxTextWidth));
+    m_cleanupConfirmation = std::make_shared<ui::widgets::MessageBox>(ui::breakLines(
+      /* translators: TR charmap encoding */ _("Order by Level and Date and Compact All Slots?\n\n"
+                                               "This will order your saves by level,"
+                                               " then by date, and move all slots"
+                                               " to the start of the list."),
+      MaxTextWidth));
     break;
   case CleanupAction::Cancel:
     m_cleanupWidget.reset();
@@ -832,4 +868,4 @@ void SavegameListMenuState::cleanupSaves(const engine::world::World& world)
   // must be re-initialized, because we might end up in an empty slot, which will then make items in the list invalid
   m_cleanupWidget.reset();
 }
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/savegamelistmenustate.h b/src/menu/savegamelistmenustate.h
index bb3745714..a23ffbc0d 100644
--- a/src/menu/savegamelistmenustate.h
+++ b/src/menu/savegamelistmenustate.h
@@ -37,9 +37,8 @@ namespace menu
 struct MenuDisplay;
 struct MenuRingTransform;
 
-class SavegameListMenuState : public ListDisplayMenuState
+class SavegameListMenuState final : public ListDisplayMenuState
 {
-private:
   class SavegameEntry;
 
   std::unique_ptr<MenuState> m_previous;
@@ -49,12 +48,14 @@ class SavegameListMenuState : public ListDisplayMenuState
   bool m_loading;
   std::shared_ptr<ui::widgets::MessageBox> m_overwriteConfirmation;
   std::shared_ptr<ui::widgets::MessageBox> m_cleanupConfirmation;
+
   enum class Ordering : uint8_t
   {
     Slot,
     DateAsc,
     DateDesc
   };
+
   Ordering m_ordering = Ordering::Slot;
   std::chrono::steady_clock::time_point m_confirmOverwritePressedSince;
 
@@ -63,12 +64,12 @@ class SavegameListMenuState : public ListDisplayMenuState
   std::map<size_t, engine::SavegameInfo> m_savegameInfos;
 
   void sortEntries();
-  [[nodiscard]] std::unique_ptr<MenuState>
-    onDefaultFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display);
-  [[nodiscard]] std::unique_ptr<MenuState>
-    onConfirmOverwriteFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display);
-  [[nodiscard]] std::unique_ptr<MenuState>
-    onCleanupFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display);
+  [[nodiscard]] std::unique_ptr<MenuState> onDefaultTick(engine::world::World& world, MenuDisplay& display);
+  [[nodiscard]] std::unique_ptr<MenuState> onConfirmOverwriteTick(engine::world::World& world, MenuDisplay& display);
+  [[nodiscard]] std::unique_ptr<MenuState> onCleanupTick(engine::world::World& world, MenuDisplay& display);
+  void onDefaultDraw(ui::Ui& ui, engine::world::World& world, MenuDisplay& display);
+  void onConfirmOverwriteDraw(ui::Ui& ui, engine::world::World& world, MenuDisplay& display);
+  void onCleanupDraw(ui::Ui& ui, engine::world::World& world, MenuDisplay& display);
   void selectMostRecentSlot();
   void selectFirstFreeOrOldestSlot();
 
@@ -83,8 +84,9 @@ class SavegameListMenuState : public ListDisplayMenuState
                                  const engine::world::World& world,
                                  bool loading);
 
-  std::unique_ptr<MenuState> onSelected(size_t idx, engine::world::World& world, MenuDisplay& display) override;
+  std::unique_ptr<MenuState> onSelected(size_t selectedIdx, engine::world::World& world, MenuDisplay& display) override;
   std::unique_ptr<MenuState> onAborted() override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/selectedmenustate.cpp b/src/menu/selectedmenustate.cpp
index 3fd98433c..4a0d95626 100644
--- a/src/menu/selectedmenustate.cpp
+++ b/src/menu/selectedmenustate.cpp
@@ -7,6 +7,7 @@
 #include "deflateringmenustate.h"
 #include "deselectingmenustate.h"
 #include "donemenustate.h"
+#include "engine/engine.h"
 #include "engine/items_tr1.h"
 #include "engine/objectmanager.h"
 #include "engine/objects/laraobject.h"
@@ -32,7 +33,7 @@
 
 namespace menu
 {
-std::unique_ptr<MenuState> SelectedMenuState::onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+std::unique_ptr<MenuState> SelectedMenuState::tick(engine::world::World& world, MenuDisplay& display)
 {
   auto& currentObject = display.getCurrentRing().getSelectedObject();
   switch(currentObject.type)
@@ -57,11 +58,11 @@ std::unique_ptr<MenuState> SelectedMenuState::onFrame(ui::Ui& ui, engine::world:
     break;
   }
 
-  if(currentObject.selectedRotationY == currentObject.rotationY && currentObject.animate())
+  if(currentObject.selectedRotationY == currentObject.rotationY && currentObject.tick())
     return nullptr;
 
   const bool autoSelect = MenuDisplay::doOptions(world, currentObject);
-  if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
+  if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
   {
     if(display.rings.size() > 1 || !display.allowMenuClose)
     {
@@ -73,7 +74,8 @@ std::unique_ptr<MenuState> SelectedMenuState::onFrame(ui::Ui& ui, engine::world:
         DeflateRingMenuState::Direction::Backpack, create<DoneMenuState>(MenuResult::Closed))));
     }
   }
-  else if(autoSelect || world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  else if(autoSelect
+          || world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     display.inventoryChosen = currentObject.type;
     if(display.mode == InventoryMode::TitleMode
@@ -103,7 +105,7 @@ std::unique_ptr<MenuState> SelectedMenuState::onFrame(ui::Ui& ui, engine::world:
     case engine::TR1ItemId::Key3Sprite:
     case engine::TR1ItemId::Key4:
     case engine::TR1ItemId::Key4Sprite:
-      if(auto lara = world.getObjectManager().getLaraPtr())
+      if(const auto lara = world.getObjectManager().getLaraPtr())
         lara->playSoundEffect(engine::TR1SoundEffect::LaraNo);
       break;
     default:
@@ -115,18 +117,19 @@ std::unique_ptr<MenuState> SelectedMenuState::onFrame(ui::Ui& ui, engine::world:
       create<DeflateRingMenuState>(DeflateRingMenuState::Direction::Backpack, create<DoneMenuState>(result))));
   }
 
-  if(m_itemTitle == nullptr)
-    m_itemTitle = std::make_unique<ui::Text>(currentObject.name);
-  m_itemTitle->draw(
-    ui, world.getPresenter().getTrFont(), {(ui.getSize().x - m_itemTitle->getWidth()) / 2, ui.getSize().y - 16});
-
   return nullptr;
 }
 
-void SelectedMenuState::handleObject(ui::Ui& /*ui*/,
-                                     engine::world::World& /*world*/,
-                                     MenuDisplay& display,
-                                     MenuObject& object)
+void SelectedMenuState::constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display)
+{
+  if(m_itemTitle == nullptr)
+    m_itemTitle = std::make_unique<ui::Text>(display.getCurrentRing().getSelectedObject().name);
+  m_itemTitle->draw(ui,
+                    world.getEngine().getPresenter().getTrFont(),
+                    {(ui.getSize().x - m_itemTitle->getWidth()) / 2, ui.getSize().y - 16});
+}
+
+void SelectedMenuState::handleObjectTick(engine::world::World& /*world*/, MenuDisplay& display, MenuObject& object)
 {
   if(&object != &display.getCurrentRing().getSelectedObject())
     zeroRotation(object, 256_au);
diff --git a/src/menu/selectedmenustate.h b/src/menu/selectedmenustate.h
index 8ef7d6f8e..354a525c9 100644
--- a/src/menu/selectedmenustate.h
+++ b/src/menu/selectedmenustate.h
@@ -27,8 +27,9 @@ class SelectedMenuState : public MenuState
   explicit SelectedMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform);
   ~SelectedMenuState() override;
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 
 private:
   std::unique_ptr<ui::Text> m_itemTitle;
diff --git a/src/menu/selectlevelmenustate.cpp b/src/menu/selectlevelmenustate.cpp
index 5dbc13cf6..a83c7d192 100644
--- a/src/menu/selectlevelmenustate.cpp
+++ b/src/menu/selectlevelmenustate.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/range/adaptor/indexed.hpp>
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <utility>
 
@@ -27,7 +27,7 @@ SelectLevelMenuState::SelectLevelMenuState(const std::shared_ptr<MenuRingTransfo
 {
   auto appendLabel = [this](const std::string& title)
   {
-    append(gsl::make_shared<ui::widgets::Label>(title, ui::widgets::Label::Alignment::Center));
+    append(gsl_lite::make_shared<ui::widgets::Label>(title, ui::widgets::Label::Alignment::Center));
   };
 
   for(const auto& item :
@@ -55,9 +55,9 @@ std::unique_ptr<MenuState> SelectLevelMenuState::onAborted()
 }
 
 std::unique_ptr<MenuState>
-  SelectLevelMenuState::onSelected(size_t idx, engine::world::World& /*world*/, MenuDisplay& display)
+  SelectLevelMenuState::onSelected(const size_t idx, engine::world::World& /*world*/, MenuDisplay& display)
 {
   return create<ClosePassportMenuState>(display.getCurrentRing().getSelectedObject(),
                                         create<RequestLevelMenuState>(m_indices.at(idx)));
 }
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/selectlevelmenustate.h b/src/menu/selectlevelmenustate.h
index 13962e4c1..8c99da9d2 100644
--- a/src/menu/selectlevelmenustate.h
+++ b/src/menu/selectlevelmenustate.h
@@ -8,7 +8,7 @@
 
 namespace menu
 {
-class SelectLevelMenuState : public ListDisplayMenuState
+class SelectLevelMenuState final : public ListDisplayMenuState
 {
 public:
   explicit SelectLevelMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
diff --git a/src/menu/setitemtypemenustate.cpp b/src/menu/setitemtypemenustate.cpp
index 373b8ae22..51d76de1b 100644
--- a/src/menu/setitemtypemenustate.cpp
+++ b/src/menu/setitemtypemenustate.cpp
@@ -10,16 +10,16 @@
 
 namespace menu
 {
-std::unique_ptr<MenuState>
-  SetItemTypeMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+std::unique_ptr<MenuState> SetItemTypeMenuState::tick(engine::world::World& /*world*/, MenuDisplay& /*display*/)
 {
   return std::move(m_next);
 }
 
-void SetItemTypeMenuState::handleObject(ui::Ui& /*ui*/,
-                                        engine::world::World& world,
-                                        MenuDisplay& display,
-                                        MenuObject& object)
+void SetItemTypeMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
+
+void SetItemTypeMenuState::handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object)
 {
   if(&object == &display.getCurrentRing().getSelectedObject())
   {
diff --git a/src/menu/setitemtypemenustate.h b/src/menu/setitemtypemenustate.h
index b1b9c5f84..56af9449a 100644
--- a/src/menu/setitemtypemenustate.h
+++ b/src/menu/setitemtypemenustate.h
@@ -28,7 +28,6 @@ struct MenuRingTransform;
 
 class SetItemTypeMenuState : public MenuState
 {
-private:
   engine::TR1ItemId m_type;
   std::unique_ptr<MenuState> m_next;
 
@@ -42,7 +41,8 @@ class SetItemTypeMenuState : public MenuState
   {
   }
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/settingsmenustate.cpp b/src/menu/settingsmenustate.cpp
index ff1ee27f1..2b108d6fe 100644
--- a/src/menu/settingsmenustate.cpp
+++ b/src/menu/settingsmenustate.cpp
@@ -32,7 +32,7 @@
 #include <functional>
 #include <gl/glad_init.h>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <ios>
 #include <memory>
@@ -51,7 +51,7 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
                                      engine::Engine& engine)
     : SelectedMenuState{ringTransform}
     , m_previous{std::move(previous)}
-    , m_tabs{gsl::make_unique<ui::widgets::TabBox>()}
+    , m_tabs{gsl_lite::make_unique<ui::widgets::TabBox>()}
 
 {
   static const auto toggle = [](engine::Engine& engine, bool& value)
@@ -60,20 +60,20 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
     engine.applySettings();
   };
 
-  auto tab = gsl::make_shared<ui::widgets::Tab>(/* translators: TR charmap encoding */ _("Effects"));
+  auto tab = gsl_lite::make_shared<ui::widgets::Tab>(/* translators: TR charmap encoding */ _("Effects"));
 
-  auto listBox = gsl::make_shared<ui::widgets::CheckListBox>();
+  auto listBox = gsl_lite::make_shared<ui::widgets::CheckListBox>();
   m_listBoxes.emplace_back(listBox);
   m_tabs->addTab(tab, listBox);
   m_descriptions.emplace_back();
 
   {
     auto tmp = std::make_shared<ui::widgets::ValueSelector<uint8_t>>(
-      [](uint8_t value)
+      [](const uint8_t value)
       {
         return /* translators: TR charmap encoding */ _("CRT Version \x1f\x6c %1% \x1f\x6d", value + 1);
       },
-      [&engine](uint8_t value)
+      [&engine](const uint8_t value)
       {
         engine.getEngineConfig()->renderSettings.crtVersion = value;
         engine.applySettings();
@@ -81,11 +81,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       std::vector<uint8_t>{0, 1});
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->renderSettings.crtActive;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->renderSettings.crtActive);
       });
@@ -99,11 +99,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Depth-of-Field"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.dof;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.dof);
     });
@@ -115,11 +115,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Lens Distortion"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.lensDistortion;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.lensDistortion);
     });
@@ -131,11 +131,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Film Grain"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.filmGrain;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.filmGrain);
     });
@@ -145,11 +145,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Velvia"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.velvia;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.velvia);
     });
@@ -159,11 +159,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Bloom"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.bloom;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.bloom);
     });
@@ -174,11 +174,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Edge Outlines"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.edges;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.edges);
     });
@@ -187,11 +187,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Muzzle Flash Lighting"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.muzzleFlashLight;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.muzzleFlashLight);
     });
@@ -205,12 +205,12 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       values.emplace_back(v);
 
     auto tmp = std::make_shared<ui::widgets::ValueSelector<int8_t>>(
-      [](int8_t value)
+      [](const int8_t value)
       {
         return /* translators: TR charmap encoding */ _("Brightness \x1f\x6c %1% \x1f\x6d",
                                                         boost::io::group(std::showpos, static_cast<int32_t>(value)));
       },
-      [&engine](int8_t value)
+      [&engine](const int8_t value)
       {
         engine.getEngineConfig()->renderSettings.brightness = value;
         engine.applySettings();
@@ -218,11 +218,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       values);
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->renderSettings.brightnessEnabled;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->renderSettings.brightnessEnabled);
       });
@@ -238,12 +238,12 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       values.emplace_back(v);
 
     auto tmp = std::make_shared<ui::widgets::ValueSelector<int8_t>>(
-      [](int8_t value)
+      [](const int8_t value)
       {
         return /* translators: TR charmap encoding */ _("Contrast \x1f\x6c %1% \x1f\x6d",
                                                         boost::io::group(std::showpos, static_cast<int32_t>(value)));
       },
-      [&engine](int8_t value)
+      [&engine](const int8_t value)
       {
         engine.getEngineConfig()->renderSettings.contrast = value;
         engine.applySettings();
@@ -251,11 +251,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       values);
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->renderSettings.contrastEnabled;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->renderSettings.contrastEnabled);
       });
@@ -266,10 +266,10 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   }
 
   {
-    const std::vector<int32_t> values{1, 2, 3};
+    const std::vector values{1, 2, 3};
 
     auto tmp = std::make_shared<ui::widgets::ValueSelector<int32_t>>(
-      [](int32_t value)
+      [](const int32_t value)
       {
         std::string mode;
         switch(value)
@@ -288,7 +288,7 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
         }
         return /* translators: TR charmap encoding */ _("\x1f\x6c %1% \x1f\x6d Dynamic Lighting", mode);
       },
-      [&engine](int32_t value)
+      [&engine](const int32_t value)
       {
         engine.getEngineConfig()->renderSettings.lightingMode = value;
         engine.applySettings();
@@ -296,11 +296,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       values);
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->renderSettings.lightingModeActive;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->renderSettings.lightingModeActive);
       });
@@ -312,9 +312,9 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       MaxDescriptionWidth));
   }
 
-  listBox = gsl::make_shared<ui::widgets::CheckListBox>();
+  listBox = gsl_lite::make_shared<ui::widgets::CheckListBox>();
   m_listBoxes.emplace_back(listBox);
-  tab = gsl::make_shared<ui::widgets::Tab>(/* translators: TR charmap encoding */ _("Quality"));
+  tab = gsl_lite::make_shared<ui::widgets::Tab>(/* translators: TR charmap encoding */ _("Quality"));
   m_descriptions.emplace_back();
 
   m_tabs->addTab(tab, listBox);
@@ -322,11 +322,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Bilinear Filtering"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.bilinearFiltering;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.bilinearFiltering);
     });
@@ -335,7 +335,7 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
     MaxDescriptionWidth));
   if(gl::hasAnisotropicFilteringExtension())
   {
-    const auto maxLevel = gsl::narrow<uint32_t>(std::lround(gl::getMaxAnisotropyLevel()));
+    const auto maxLevel = gsl_lite::narrow<uint32_t>(std::lround(gl::getMaxAnisotropyLevel()));
     std::vector<uint32_t> levels;
     for(uint32_t i = 1; i <= maxLevel; i *= 2)
     {
@@ -348,7 +348,7 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
         {
           return /* translators: TR charmap encoding */ _("\x1f\x6c %1%x \x1f\x6d Anisotropic Filtering", level);
         },
-        [&engine](uint32_t value)
+        [&engine](const uint32_t value)
         {
           engine.getEngineConfig()->renderSettings.anisotropyLevel = value;
           engine.applySettings();
@@ -358,11 +358,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
 
       listBox->addSetting(
         gslu::nn_shared<ui::widgets::Widget>{tmp},
-        [&engine]()
+        [&engine]
         {
           return engine.getEngineConfig()->renderSettings.anisotropyActive;
         },
-        [&engine, maxLevel = gsl::narrow<uint32_t>(std::lround(gl::getMaxAnisotropyLevel()))]()
+        [&engine, maxLevel = gsl_lite::narrow<uint32_t>(std::lround(gl::getMaxAnisotropyLevel()))]
         {
           toggle(engine, engine.getEngineConfig()->renderSettings.anisotropyActive);
         });
@@ -374,11 +374,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Denoise Water Surface"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.waterDenoise;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.waterDenoise);
     });
@@ -387,11 +387,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("HBAO"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.hbao;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.hbao);
     });
@@ -403,7 +403,7 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
 
   {
     auto tmp = std::make_shared<ui::widgets::ValueSelector<uint8_t>>(
-      [](uint8_t value)
+      [](const uint8_t value)
       {
         const char* quality = nullptr;
         switch(value)
@@ -425,7 +425,7 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
         }
         return /* translators: TR charmap encoding */ _("FXAA \x1f\x6c %1% \x1f\x6d", quality);
       },
-      [&engine](uint8_t value)
+      [&engine](const uint8_t value)
       {
         engine.getEngineConfig()->renderSettings.fxaaPreset = value;
         engine.applySettings();
@@ -433,11 +433,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       std::vector<uint8_t>{10, 15, 29, 39});
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->renderSettings.fxaaActive;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->renderSettings.fxaaActive);
       });
@@ -452,11 +452,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("High Quality Shadows"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.highQualityShadows;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.highQualityShadows);
     });
@@ -468,12 +468,12 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
 
   {
     auto tmp = std::make_shared<ui::widgets::ValueSelector<uint8_t>>(
-      [](uint8_t value)
+      [](const uint8_t value)
       {
         return /* translators: TR charmap encoding */ _("\x1f\x6c 1/%1% \x1f\x6d Render Scale",
                                                         static_cast<uint32_t>(value));
       },
-      [&engine](uint8_t value)
+      [&engine](const uint8_t value)
       {
         engine.getEngineConfig()->renderSettings.renderResolutionDivisor = value;
         engine.applySettings();
@@ -481,11 +481,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       std::vector<uint8_t>{2, 3, 4, 5, 6, 7, 8});
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->renderSettings.renderResolutionDivisorActive;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->renderSettings.renderResolutionDivisorActive);
       });
@@ -498,12 +498,12 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
 
   {
     auto tmp = std::make_shared<ui::widgets::ValueSelector<uint8_t>>(
-      [](uint8_t value)
+      [](const uint8_t value)
       {
         return /* translators: TR charmap encoding */ _("\x1f\x6c %1%x \x1f\x6d UI Scale",
                                                         static_cast<uint32_t>(value));
       },
-      [&engine](uint8_t value)
+      [&engine](const uint8_t value)
       {
         engine.getEngineConfig()->renderSettings.uiScaleMultiplier = value;
         engine.applySettings();
@@ -511,11 +511,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       std::vector<uint8_t>{2, 3, 4, 5, 6, 7, 8});
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->renderSettings.uiScaleActive;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->renderSettings.uiScaleActive);
       });
@@ -527,31 +527,31 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Smoother Animations"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->animSmoothing;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->animSmoothing);
     });
   m_descriptions.back().emplace_back(std::make_shared<ui::widgets::TextBox>(
     /* translators: TR charmap encoding */ _("Smoothes out some choppy model animations."), MaxDescriptionWidth));
 
-  listBox = gsl::make_shared<ui::widgets::CheckListBox>();
+  listBox = gsl_lite::make_shared<ui::widgets::CheckListBox>();
   m_listBoxes.emplace_back(listBox);
-  tab = gsl::make_shared<ui::widgets::Tab>(/* translators: TR charmap encoding */ _("Other"));
+  tab = gsl_lite::make_shared<ui::widgets::Tab>(/* translators: TR charmap encoding */ _("Other"));
   m_tabs->addTab(tab, listBox);
   m_descriptions.emplace_back();
 
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Fullscreen"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.fullscreen;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.fullscreen);
     });
@@ -560,11 +560,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
 
   {
     auto tmp = std::make_shared<ui::widgets::ValueSelector<uint8_t>>(
-      [](uint8_t value)
+      [](const uint8_t value)
       {
         return /* translators: TR charmap encoding */ _("\x1f\x6c %1% \x1f\x6d Percent Dust Particles", 100 / value);
       },
-      [&engine](uint8_t value)
+      [&engine](const uint8_t value)
       {
         engine.getEngineConfig()->renderSettings.dustDensity = value;
         engine.applySettings();
@@ -572,11 +572,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
       std::vector<uint8_t>{10, 5, 4, 3, 2, 1});
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->renderSettings.dustActive;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->renderSettings.dustActive);
       });
@@ -591,11 +591,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("More Lights"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->renderSettings.moreLights;
     },
-    [&engine]()
+    [&engine]
     {
       toggle(engine, engine.getEngineConfig()->renderSettings.moreLights);
     });
@@ -607,11 +607,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Ghost"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->displaySettings.ghost;
     },
-    [&engine]()
+    [&engine]
     {
       auto& b = engine.getEngineConfig()->displaySettings.ghost;
       b = !b;
@@ -624,11 +624,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
     listBox->addSetting(
       /* translators: TR charmap encoding */
       _("Show Players' Names"),
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->displaySettings.showCoopNames;
       },
-      [&engine]()
+      [&engine]
       {
         auto& b = engine.getEngineConfig()->displaySettings.showCoopNames;
         b = !b;
@@ -639,27 +639,28 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Restore Health on Level Start"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->restoreHealth;
     },
-    [&engine]()
+    [&engine]
     {
       auto& b = engine.getEngineConfig()->restoreHealth;
       b = !b;
     });
   m_descriptions.back().emplace_back(std::make_shared<ui::widgets::TextBox>(
-    /* translators: TR charmap encoding */ _("Enable to restore your health on each level start. When disabled, your"
-                                             " health won't get filled up after each level."),
+    /* translators: TR charmap encoding */
+    _("Enable to restore your health on each level start. When disabled, your"
+      " health won't get filled up after each level."),
     MaxDescriptionWidth));
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Low Health: Pulse Health Bar"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->pulseLowHealthHealthBar;
     },
-    [&engine]()
+    [&engine]
     {
       auto& b = engine.getEngineConfig()->pulseLowHealthHealthBar;
       b = !b;
@@ -671,27 +672,28 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Low Health: Reduce Color"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->lowHealthMonochrome;
     },
-    [&engine]()
+    [&engine]
     {
       auto& b = engine.getEngineConfig()->lowHealthMonochrome;
       b = !b;
     });
   m_descriptions.back().emplace_back(std::make_shared<ui::widgets::TextBox>(
-    /* translators: TR charmap encoding */ _("Enable to make the screen go black and white the lower your health is. "
-                                             "This effect will only start to take effect on very low health."),
+    /* translators: TR charmap encoding */
+    _("Enable to make the screen go black and white the lower your health is. "
+      "This effect will only start to take effect on very low health."),
     MaxDescriptionWidth));
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Water Bed Bubbles"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->waterBedBubbles;
     },
-    [&engine]()
+    [&engine]
     {
       auto& b = engine.getEngineConfig()->waterBedBubbles;
       b = !b;
@@ -701,11 +703,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Butt Bubbles"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->buttBubbles;
     },
-    [&engine]()
+    [&engine]
     {
       auto& b = engine.getEngineConfig()->buttBubbles;
       b = !b;
@@ -714,25 +716,25 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
     /* translators: TR charmap encoding */ _("Give Lara a bubbly personality."), MaxDescriptionWidth));
   {
     auto tmp = std::make_shared<ui::widgets::ValueSelector<uint8_t>>(
-      [](uint8_t value)
+      [](const uint8_t value)
       {
         return /* translators: TR charmap encoding */ P_("Save Reminder after \x1f\x6c %1% \x1f\x6d Minute",
                                                          "Save Reminder after \x1f\x6c %1% \x1f\x6d Minutes",
                                                          value,
                                                          static_cast<uint32_t>(value));
       },
-      [&engine](uint8_t value)
+      [&engine](const uint8_t value)
       {
         engine.getEngineConfig()->saveReminderMinutes = value;
       },
       std::vector<uint8_t>{1, 2, 3, 4, 5, 10, 15, 20, 25, 30, 45, 60});
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->saveReminderEnabled;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->saveReminderEnabled);
       });
@@ -744,11 +746,11 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   listBox->addSetting(
     /* translators: TR charmap encoding */
     _("Select First Free or Oldest Slot"),
-    [&engine]()
+    [&engine]
     {
       return engine.getEngineConfig()->selectFirstFreeOrOldestSlot;
     },
-    [&engine]()
+    [&engine]
     {
       auto& b = engine.getEngineConfig()->selectFirstFreeOrOldestSlot;
       b = !b;
@@ -760,25 +762,25 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
     MaxDescriptionWidth));
   {
     auto tmp = std::make_shared<ui::widgets::ValueSelector<uint8_t>>(
-      [](uint8_t value)
+      [](const uint8_t value)
       {
         return /* translators: TR charmap encoding */ P_("Delay Overwrite for \x1f\x6c %1% \x1f\x6d Second",
                                                          "Delay Overwrite for \x1f\x6c %1% \x1f\x6d Seconds",
                                                          value,
                                                          static_cast<uint32_t>(value));
       },
-      [&engine](uint8_t value)
+      [&engine](const uint8_t value)
       {
         engine.getEngineConfig()->delaySaveDurationSeconds = value;
       },
       std::vector<uint8_t>{1, 2, 3, 4, 5});
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->delaySaveEnabled;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->delaySaveEnabled);
       });
@@ -791,23 +793,23 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   }
   {
     auto tmp = std::make_shared<ui::widgets::ValueSelector<uint8_t>>(
-      [](uint8_t value)
+      [](const uint8_t value)
       {
         return /* translators: TR charmap encoding */ _("Preserve \x1f\x6c %1% \x1f\x6d Percent of Medi Packs",
                                                         static_cast<uint32_t>(value));
       },
-      [&engine](uint8_t value)
+      [&engine](const uint8_t value)
       {
         engine.getEngineConfig()->mediPackPreservation = value;
       },
       std::vector<uint8_t>{10, 20, 30, 40, 50, 60, 70, 80, 90});
     listBox->addSetting(
       gslu::nn_shared<ui::widgets::Widget>{tmp},
-      [&engine]()
+      [&engine]
       {
         return engine.getEngineConfig()->mediPackPreservationEnabled;
       },
-      [&engine]()
+      [&engine]
       {
         toggle(engine, engine.getEngineConfig()->mediPackPreservationEnabled);
       });
@@ -828,36 +830,25 @@ SettingsMenuState::SettingsMenuState(const std::shared_ptr<MenuRingTransform>& r
   }
 }
 
-std::unique_ptr<MenuState> SettingsMenuState::onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+std::unique_ptr<MenuState> SettingsMenuState::tick(engine::world::World& world, MenuDisplay& /*display*/)
 {
-  m_tabs->fitToContent();
-  m_tabs->setPosition({(ui.getSize().x - m_tabs->getSize().x) / 2, ui.getSize().y - m_tabs->getSize().y - 90});
-
   for(size_t i = 0; i < m_listBoxes.size(); ++i)
   {
-    m_listBoxes[i]->update(i == m_tabs->getSelectedTab());
+    m_listBoxes[i]->tick(i == m_tabs->getSelectedTab());
   }
-  m_tabs->update(true);
-  m_tabs->draw(ui, world.getPresenter());
+  m_tabs->tick(true);
 
   const auto& listBox = m_listBoxes[m_tabs->getSelectedTab()];
 
-  {
-    const auto& descriptions = m_descriptions.at(m_tabs->getSelectedTab());
-    const auto& description = descriptions.at(listBox->getSelectedIndex());
-    description->setPosition({(ui.getSize().x - MaxDescriptionWidth) / 2,
-                              listBox->getPosition().y - description->getSize().y - 3 * ui::FontHeight});
-    description->draw(ui, world.getPresenter());
-  }
-
-  if(world.getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(hid::AxisMovement::Forward))
+  if(world.getEngine().getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
+       hid::AxisMovement::Forward))
   {
     if(!listBox->prevEntry())
     {
       listBox->setSelectedEntry(listBox->getEntryCount() - 1);
     }
   }
-  else if(world.getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
+  else if(world.getEngine().getPresenter().getInputHandler().getInputState().menuZMovement.justChangedTo(
             hid::AxisMovement::Backward))
   {
     if(!listBox->nextEntry())
@@ -865,35 +856,50 @@ std::unique_ptr<MenuState> SettingsMenuState::onFrame(ui::Ui& ui, engine::world:
       listBox->setSelectedEntry(0);
     }
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrevScreen))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrevScreen))
   {
     m_tabs->prevTab();
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::NextScreen))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::NextScreen))
   {
     m_tabs->nextTab();
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::PrimaryInteraction))
   {
     const auto& [getter, toggler, checkbox] = listBox->getSelected();
     toggler();
     checkbox->setChecked(getter());
   }
-  else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
+  else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::Return))
   {
     return std::move(m_previous);
   }
-  else if(auto tmp = gslu::dynamic_pointer_cast<ui::widgets::ValueSelectorBase>(
+  else if(const auto tmp = gslu::dynamic_pointer_cast<ui::widgets::ValueSelectorBase>(
             std::get<2>(listBox->getSelected())->getContent());
           tmp != nullptr)
   {
-    if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuLeft))
+    if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuLeft))
       tmp->selectPrev();
-    else if(world.getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuRight))
+    else if(world.getEngine().getPresenter().getInputHandler().hasDebouncedAction(hid::Action::MenuRight))
       tmp->selectNext();
   }
 
   return nullptr;
 }
+
+void SettingsMenuState::constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& /*display*/)
+{
+  m_tabs->fitToContent();
+  m_tabs->setPosition({(ui.getSize().x - m_tabs->getSize().x) / 2, ui.getSize().y - m_tabs->getSize().y - 90});
+  m_tabs->draw(ui, world.getEngine().getPresenter());
+
+  const auto& listBox = m_listBoxes[m_tabs->getSelectedTab()];
+  const auto& descriptions = m_descriptions.at(m_tabs->getSelectedTab());
+  const auto& description = descriptions.at(listBox->getSelectedIndex());
+  description->setPosition({(ui.getSize().x - MaxDescriptionWidth) / 2,
+                            listBox->getPosition().y - description->getSize().y - 3 * ui::FontHeight});
+  description->draw(ui, world.getEngine().getPresenter());
+}
+
 SettingsMenuState::~SettingsMenuState() = default;
-} // namespace menu
+} // namespace menu
\ No newline at end of file
diff --git a/src/menu/settingsmenustate.h b/src/menu/settingsmenustate.h
index 277ddfeb2..bdf37cb99 100644
--- a/src/menu/settingsmenustate.h
+++ b/src/menu/settingsmenustate.h
@@ -34,9 +34,8 @@ struct MenuDisplay;
 struct MenuRingTransform;
 class MenuState;
 
-class SettingsMenuState : public SelectedMenuState
+class SettingsMenuState final : public SelectedMenuState
 {
-private:
   std::vector<std::shared_ptr<ui::widgets::CheckListBox>> m_listBoxes;
   std::vector<std::vector<std::shared_ptr<ui::widgets::TextBox>>> m_descriptions;
   std::unique_ptr<MenuState> m_previous;
@@ -47,7 +46,8 @@ class SettingsMenuState : public SelectedMenuState
                              std::unique_ptr<MenuState> previous,
                              engine::Engine& engine);
 
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
   ~SettingsMenuState() override;
 };
 } // namespace menu
diff --git a/src/menu/switchringmenustate.cpp b/src/menu/switchringmenustate.cpp
index 896fb74ba..a1fe224f3 100644
--- a/src/menu/switchringmenustate.cpp
+++ b/src/menu/switchringmenustate.cpp
@@ -14,15 +14,14 @@
 
 namespace menu
 {
-std::unique_ptr<MenuState>
-  SwitchRingMenuState::onFrame(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& display)
+std::unique_ptr<MenuState> SwitchRingMenuState::tick(engine::world::World& /*world*/, MenuDisplay& display)
 {
   if(m_duration != Duration)
   {
-    m_duration += 1_frame;
+    m_duration += 1_tick;
     m_ringTransform->radius -= m_radiusSpeed;
     m_ringTransform->cameraPos.Z = MenuRingTransform::CameraZPosOffset + m_ringTransform->radius;
-    m_ringTransform->ringRotation -= 180_deg / Duration * 1_frame;
+    m_ringTransform->ringRotation -= 180_deg / Duration * 1_tick;
     m_ringTransform->cameraRotX = exactScale(m_targetCameraRotX, m_duration, Duration);
     return nullptr;
   }
@@ -34,10 +33,11 @@ std::unique_ptr<MenuState>
   return create<InflateRingMenuState>(false);
 }
 
-void SwitchRingMenuState::handleObject(ui::Ui& /*ui*/,
-                                       engine::world::World& world,
-                                       MenuDisplay& display,
-                                       MenuObject& object)
+void SwitchRingMenuState::constructUi(ui::Ui& /*ui*/, engine::world::World& /*world*/, MenuDisplay& /*display*/)
+{
+}
+
+void SwitchRingMenuState::handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object)
 {
   if(&object == &display.getCurrentRing().getSelectedObject())
   {
@@ -50,8 +50,8 @@ void SwitchRingMenuState::handleObject(ui::Ui& /*ui*/,
 }
 
 SwitchRingMenuState::SwitchRingMenuState(const std::shared_ptr<MenuRingTransform>& ringTransform,
-                                         size_t next,
-                                         bool down)
+                                         const size_t next,
+                                         const bool down)
     : MenuState{ringTransform}
     , m_next{next}
     , m_down{down}
@@ -60,7 +60,7 @@ SwitchRingMenuState::SwitchRingMenuState(const std::shared_ptr<MenuRingTransform
 
 void SwitchRingMenuState::begin(engine::world::World& /*world*/)
 {
-  m_radiusSpeed = m_ringTransform->radius / Duration * 1_frame;
+  m_radiusSpeed = m_ringTransform->radius / Duration * 1_tick;
   m_targetCameraRotX = m_down ? -MenuRingTransform::CameraSwitchRingXRot : MenuRingTransform::CameraSwitchRingXRot;
 }
 } // namespace menu
diff --git a/src/menu/switchringmenustate.h b/src/menu/switchringmenustate.h
index ca2310593..444dbcc3d 100644
--- a/src/menu/switchringmenustate.h
+++ b/src/menu/switchringmenustate.h
@@ -25,10 +25,9 @@ struct MenuRingTransform;
 
 class SwitchRingMenuState : public MenuState
 {
-private:
-  static constexpr core::Frame Duration = 24_frame / 2;
+  static constexpr core::Tick Duration = 24_tick / 2;
 
-  core::Frame m_duration{Duration};
+  core::Tick m_duration{Duration};
   core::Length m_radiusSpeed;
   core::Angle m_targetCameraRotX;
   size_t m_next;
@@ -39,7 +38,8 @@ class SwitchRingMenuState : public MenuState
 
   void begin(engine::world::World& world) override;
 
-  void handleObject(ui::Ui& ui, engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
-  std::unique_ptr<MenuState> onFrame(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
+  void handleObjectTick(engine::world::World& world, MenuDisplay& display, MenuObject& object) override;
+  std::unique_ptr<MenuState> tick(engine::world::World& world, MenuDisplay& display) override;
+  void constructUi(ui::Ui& ui, engine::world::World& world, MenuDisplay& display) override;
 };
 } // namespace menu
diff --git a/src/menu/util.cpp b/src/menu/util.cpp
index 49756f304..c119873be 100644
--- a/src/menu/util.cpp
+++ b/src/menu/util.cpp
@@ -1,6 +1,7 @@
 #include "util.h"
 
 #include "core/units.h"
+#include "engine/engine.h"
 #include "engine/presenter.h"
 #include "engine/world/world.h"
 #include "hid/inputhandler.h"
@@ -28,9 +29,10 @@ void rotateForSelection(MenuObject& object)
   object.rotationY -= object.rotationY % Speed;
 }
 
-void idleRotation(engine::world::World& world, MenuObject& object, bool force)
+void idleRotation(engine::world::World& world, MenuObject& object, const bool force)
 {
-  if(force || world.getPresenter().getInputHandler().getInputState().menuXMovement == hid::AxisMovement::Null)
+  if(force
+     || world.getEngine().getPresenter().getInputHandler().getInputState().menuXMovement == hid::AxisMovement::Null)
   {
     object.rotationY += 256_au * 2;
   }
diff --git a/src/menu/util.h b/src/menu/util.h
index d1f033d60..023f43a19 100644
--- a/src/menu/util.h
+++ b/src/menu/util.h
@@ -19,7 +19,7 @@ extern void idleRotation(engine::world::World& world, MenuObject& object, bool f
 extern void zeroRotation(MenuObject& object, const core::Angle& speed);
 
 template<typename Unit, typename Type>
-auto exactScale(const qs::quantity<Unit, Type>& value, const core::Frame& x, const core::Frame& max)
+auto exactScale(const qs::quantity<Unit, Type>& value, const core::Tick& x, const core::Tick& max)
 {
   const auto f = x.cast<float>() / max.cast<float>();
   return (value.template cast<float>() * f).template cast<Type>();
diff --git a/src/network/hauntedcoopclient.cpp b/src/network/hauntedcoopclient.cpp
index e50a9c787..28ea1354e 100644
--- a/src/network/hauntedcoopclient.cpp
+++ b/src/network/hauntedcoopclient.cpp
@@ -29,7 +29,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <exception>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <istream>
 #include <iterator>
 #include <memory>
@@ -108,7 +108,7 @@ struct HauntedCoopClient::ClientImpl
     std::vector<std::string> socketParts;
     boost::algorithm::split(socketParts,
                             m_networkConfig.socket,
-                            [](char c)
+                            [](const char c)
                             {
                               return c == ':';
                             });
@@ -165,29 +165,26 @@ struct HauntedCoopClient::ClientImpl
     if(!m_loggedIn || !m_socket.is_open())
       return;
 
-    {
-      const std::lock_guard guard{m_sendMutex};
-      m_sendBuffer.clear();
+    const std::lock_guard guard{m_sendMutex};
+    m_sendBuffer.clear();
 
-      data.emplace_back(m_networkConfig.color.at(0));
-      data.emplace_back(m_networkConfig.color.at(1));
-      data.emplace_back(m_networkConfig.color.at(2));
-      io::writePascal(data, m_networkConfig.username);
-      writeUpdateState(m_sendBuffer, data);
+    data.emplace_back(m_networkConfig.color.at(0));
+    data.emplace_back(m_networkConfig.color.at(1));
+    data.emplace_back(m_networkConfig.color.at(2));
+    io::writePascal(data, m_networkConfig.username);
+    writeUpdateState(m_sendBuffer, data);
 
-      ++m_fullSyncCounter;
-      if(m_fullSyncCounter >= 30 * 5)
-      {
-        m_fullSyncCounter = 0;
-        write_query_state(m_sendBuffer);
-      }
+    ++m_fullSyncCounter;
+    if(m_fullSyncCounter >= 30 * 5)
+    {
+      m_fullSyncCounter = 0;
+      write_query_state(m_sendBuffer);
+    }
 
-      if(!send())
-      {
-        BOOST_LOG_TRIVIAL(error) << "send state failed";
-        m_loggedIn = false;
-        return;
-      }
+    if(!send())
+    {
+      BOOST_LOG_TRIVIAL(error) << "send state failed";
+      m_loggedIn = false;
     }
   }
 
@@ -402,7 +399,8 @@ struct HauntedCoopClient::ClientImpl
   std::string m_levelId;
 
   using ContinueWithReadFn = void (ClientImpl::*)();
-  void continueWithRead(size_t n, ContinueWithReadFn fn)
+
+  void continueWithRead(const size_t n, ContinueWithReadFn fn)
   {
     if(!m_socket.is_open())
       return;
@@ -410,7 +408,7 @@ struct HauntedCoopClient::ClientImpl
     m_recvBuffer.resize(n);
     boost::asio::async_read(m_socket,
                             boost::asio::buffer(m_recvBuffer),
-                            [this, fn](const boost::system::error_code& err, std::size_t bytesTransferred)
+                            [this, fn](const boost::system::error_code& err, const std::size_t bytesTransferred)
                             {
                               if(err)
                               {
@@ -435,7 +433,7 @@ HauntedCoopClient::HauntedCoopClient(const std::string& gameflowId, const std::s
 {
 }
 
-void HauntedCoopClient::sendState(const PeerData& data)
+void HauntedCoopClient::sendState(const PeerData& data) const
 {
   impl->sendState(data);
 }
@@ -472,14 +470,14 @@ void io::writePascal(std::vector<uint8_t>& msg, const std::string& s)
 {
   msg.reserve(msg.size() + s.length());
   msg.emplace_back(static_cast<uint8_t>(s.length()));
-  std::copy(s.begin(), s.end(), std::back_inserter(msg));
+  std::ranges::copy(s, std::back_inserter(msg));
 }
 
 void io::writePascal(std::vector<uint8_t>& msg, const std::vector<uint8_t>& s)
 {
-  writeLE<uint16_t>(msg, gsl::narrow<uint16_t>(s.size()));
+  writeLE<uint16_t>(msg, gsl_lite::narrow<uint16_t>(s.size()));
   msg.reserve(msg.size() + s.size());
-  std::copy(s.begin(), s.end(), std::back_inserter(msg));
+  std::ranges::copy(s, std::back_inserter(msg));
 }
 
 std::string io::readPascalString(const uint8_t* msg)
@@ -496,8 +494,8 @@ std::string io::readPascalString(std::istream& stream)
   gsl_Assert(stream.gcount() == sizeof(length));
   std::vector<char> buffer;
   buffer.resize(length);
-  stream.read(buffer.data(), gsl::narrow<std::streamsize>(buffer.size()));
-  gsl_Assert(gsl::narrow<size_t>(stream.gcount()) == buffer.size());
+  stream.read(buffer.data(), gsl_lite::narrow<std::streamsize>(buffer.size()));
+  gsl_Assert(gsl_lite::narrow<size_t>(stream.gcount()) == buffer.size());
   return std::string{buffer.data(), buffer.size()};
 }
-} // namespace network
+} // namespace network
\ No newline at end of file
diff --git a/src/network/hauntedcoopclient.h b/src/network/hauntedcoopclient.h
index b84c953c5..39011e1c6 100644
--- a/src/network/hauntedcoopclient.h
+++ b/src/network/hauntedcoopclient.h
@@ -20,7 +20,7 @@ class HauntedCoopClient
   explicit HauntedCoopClient(const std::string& gameflowId, const std::string& levelId);
   ~HauntedCoopClient();
 
-  void sendState(const PeerData& data);
+  void sendState(const PeerData& data) const;
 
   [[nodiscard]] std::map<PeerId, PeerData> getStates() const;
 
@@ -42,7 +42,7 @@ class HauntedCoopClient
 namespace network::io
 {
 template<typename T>
-inline void writeLE(std::vector<uint8_t>& msg, const T& data)
+void writeLE(std::vector<uint8_t>& msg, const T& data)
 {
   for(size_t i = 0; i < sizeof(T); ++i)
   {
@@ -51,7 +51,7 @@ inline void writeLE(std::vector<uint8_t>& msg, const T& data)
 }
 
 template<typename T>
-inline T readLE(const uint8_t* data)
+T readLE(const uint8_t* data)
 {
   T result{0};
   for(size_t i = 0; i < sizeof(T); ++i)
diff --git a/src/qs/mult_div.h b/src/qs/mult_div.h
index b1ebe67ee..67dab68c3 100644
--- a/src/qs/mult_div.h
+++ b/src/qs/mult_div.h
@@ -16,7 +16,7 @@ namespace qs
 namespace detail
 {
 template<typename A, typename B>
-using enable_if_not_same_t = std::enable_if_t<!std::is_same_v<A, B>, bool>;
+concept NotSame = !std::is_same_v<A, B>;
 }
 
 template<typename... Units>
@@ -49,7 +49,7 @@ struct flatten_tuple_product<std::tuple<T>>
 };
 
 template<typename T>
-using flatten_tuple_product_t = typename flatten_tuple_product<T>::type;
+using flatten_tuple_product_t = flatten_tuple_product<T>::type;
 
 template<typename, typename>
 struct flattener;
@@ -59,6 +59,7 @@ struct flattener<std::tuple<Top...>, std::tuple<Bottom...>>
 {
   using type = fraction_unit<std::tuple<Top...>, std::tuple<Bottom...>>;
 };
+
 template<typename... Top>
 struct flattener<std::tuple<Top...>, std::tuple<>>
 {
@@ -72,7 +73,7 @@ struct flattener<std::tuple<Top>, std::tuple<>>
 };
 
 template<typename A, typename B>
-using flattener_t = typename flattener<A, B>::type;
+using flattener_t = flattener<A, B>::type;
 } // namespace detail
 
 template<typename... Top, typename... Bottom>
@@ -80,8 +81,8 @@ struct fraction_unit<std::tuple<Top...>, std::tuple<Bottom...>>
 {
   using _tmp = detail::symmetric_difference<std::tuple<Top...>, std::tuple<Bottom...>>;
 
-  using top = typename _tmp::reduced_l;
-  using bottom = typename _tmp::reduced_r;
+  using top = _tmp::reduced_l;
+  using bottom = _tmp::reduced_r;
   using type = detail::flattener_t<top, bottom>;
 
   static std::string suffix()
@@ -92,7 +93,7 @@ struct fraction_unit<std::tuple<Top...>, std::tuple<Bottom...>>
 };
 
 template<typename A, typename B>
-using fraction_unit_t = typename fraction_unit<A, B>::type;
+using fraction_unit_t = fraction_unit<A, B>::type;
 
 // NOLINTNEXTLINE(bugprone-reserved-identifier)
 #define _QS_COMBINE_TS(T1, OP, T2) decltype(std::declval<T1>() OP std::declval<T2>())
@@ -201,26 +202,20 @@ constexpr auto operator*(const quantity<fraction_unit<std::tuple<Units1Top...>,
 // Follows: lhs = product_unit, rhs = (unit, product_unit, fraction_unit)
 
 // product_unit / unit
-template<typename Type1,
-         typename Type2,
-         typename... Units1,
-         typename Unit2,
-         typename = detail::enable_if_not_same_t<product_unit<Units1...>, Unit2>>
-constexpr auto operator/(const quantity<product_unit<Units1...>, Type1>& a,
-                         const quantity<Unit2, Type2>& b) noexcept(noexcept(a.get() / b.get()))
+template<typename Type1, typename Type2, typename... Units1, typename Unit2>
+requires detail::NotSame<product_unit<Units1...>, Unit2> constexpr auto
+  operator/(const quantity<product_unit<Units1...>, Type1>& a,
+            const quantity<Unit2, Type2>& b) noexcept(noexcept(a.get() / b.get()))
 {
   return quantity<fraction_unit_t<std::tuple<Units1...>, std::tuple<Unit2>>, _QS_COMBINE_TS(Type1, /, Type2)>{
     a.get() / b.get()};
 }
 
 // product_unit / product_unit
-template<typename Type1,
-         typename Type2,
-         typename... Units1,
-         typename... Units2,
-         typename = detail::enable_if_not_same_t<std::tuple<Units1...>, std::tuple<Units2...>>>
-constexpr auto operator/(const quantity<product_unit<Units1...>, Type1>& a,
-                         const quantity<product_unit<Units2...>, Type2>& b) noexcept(noexcept(a.get() / b.get()))
+template<typename Type1, typename Type2, typename... Units1, typename... Units2>
+requires detail::NotSame<std::tuple<Units1...>, std::tuple<Units2...>> constexpr auto
+  operator/(const quantity<product_unit<Units1...>, Type1>& a,
+            const quantity<product_unit<Units2...>, Type2>& b) noexcept(noexcept(a.get() / b.get()))
 {
   return quantity<fraction_unit_t<std::tuple<Units1...>, std::tuple<Units2...>>, _QS_COMBINE_TS(Type1, /, Type2)>{
     a.get() / b.get()};
@@ -248,13 +243,10 @@ constexpr auto operator/(const quantity<Unit1, Type1>& a,
 }
 
 // unit / product_unit
-template<typename Type1,
-         typename Type2,
-         typename Unit1,
-         typename... Units2,
-         typename = detail::enable_if_not_same_t<Unit1, product_unit<Units2...>>>
-constexpr auto operator/(const quantity<Unit1, Type1>& a,
-                         const quantity<product_unit<Units2...>, Type2>& b) noexcept(noexcept(a.get() / b.get()))
+template<typename Type1, typename Type2, typename Unit1, typename... Units2>
+requires detail::NotSame<Unit1, product_unit<Units2...>> constexpr auto
+  operator/(const quantity<Unit1, Type1>& a,
+            const quantity<product_unit<Units2...>, Type2>& b) noexcept(noexcept(a.get() / b.get()))
 {
   return quantity<fraction_unit_t<std::tuple<Unit1>, std::tuple<Units2...>>, _QS_COMBINE_TS(Type1, /, Type2)>{
     a.get() / b.get()};
diff --git a/src/qs/qs.h b/src/qs/qs.h
index acd2c6472..d3c35ae7b 100644
--- a/src/qs/qs.h
+++ b/src/qs/qs.h
@@ -4,38 +4,40 @@
 #include "quantity.h" // IWYU pragma: export
 #include "stream.h"   // IWYU pragma: export
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <type_traits>
 
 // NOLINTNEXTLINE(bugprone-reserved-identifier)
 #define _QS_PAREN_WRAPPER(value) value
+// NOLINTNEXTLINE(bugprone-reserved-identifier)
+#define _QS_CONCAT(a, b) a##b
 
 #define QS_DECLARE_QUANTITY(NAME, TYPE, SUFFIX) \
   struct _##NAME##_generated_unit               \
   {                                             \
-    static gsl::czstring suffix() noexcept      \
+    static gsl_lite::czstring suffix() noexcept \
     {                                           \
       return SUFFIX;                            \
     }                                           \
   };                                            \
   using _QS_PAREN_WRAPPER(NAME) = ::qs::quantity<_##NAME##_generated_unit, _QS_PAREN_WRAPPER(TYPE)>
 
-#define QS_LITERAL_OP_ULL(TYPE, NAME)                                                                     \
-  constexpr _QS_PAREN_WRAPPER(TYPE) operator"" _QS_PAREN_WRAPPER(NAME)(unsigned long long value) noexcept \
-  {                                                                                                       \
-    return _QS_PAREN_WRAPPER(TYPE){static_cast<_QS_PAREN_WRAPPER(TYPE)::type>(value)};                    \
+#define QS_LITERAL_OP_ULL(TYPE, NAME)                                                               \
+  constexpr _QS_PAREN_WRAPPER(TYPE) _QS_CONCAT(operator"", NAME)(unsigned long long value) noexcept \
+  {                                                                                                 \
+    return _QS_PAREN_WRAPPER(TYPE){static_cast<_QS_PAREN_WRAPPER(TYPE)::type>(value)};              \
   }
 
-#define QS_LITERAL_OP_LD(TYPE, NAME)                                                               \
-  constexpr _QS_PAREN_WRAPPER(TYPE) operator"" _QS_PAREN_WRAPPER(NAME)(long double value) noexcept \
-  {                                                                                                \
-    return _QS_PAREN_WRAPPER(TYPE){static_cast<_QS_PAREN_WRAPPER(TYPE)::type>(value)};             \
+#define QS_LITERAL_OP_LD(TYPE, NAME)                                                         \
+  constexpr _QS_PAREN_WRAPPER(TYPE) _QS_CONCAT(operator"", NAME)(long double value) noexcept \
+  {                                                                                          \
+    return _QS_PAREN_WRAPPER(TYPE){static_cast<_QS_PAREN_WRAPPER(TYPE)::type>(value)};       \
   }
 
 namespace qs::detail
 {
 template<typename T>
-constexpr auto quantity_declval() -> std::enable_if_t<::qs::is_quantity_v<T>, T>;
+constexpr auto quantity_declval() -> T requires Quantity<T>;
 }
 
 #define QS_COMBINE_UNITS(L, OP, R)                                \
diff --git a/src/qs/quantity.h b/src/qs/quantity.h
index 913dbd9c1..c27b73986 100644
--- a/src/qs/quantity.h
+++ b/src/qs/quantity.h
@@ -1,28 +1,28 @@
-#pragma once
+#pragma once
 
 #include <string>
 #include <type_traits>
 
 namespace qs
 {
-template<typename, typename>
+template<typename Unit, typename Type>
 struct quantity;
 
 namespace detail
 {
-template<typename T>
+template<typename>
 struct is_quantity : std::false_type
 {
 };
 
-template<typename A, typename B>
-struct is_quantity<quantity<A, B>> : std::true_type
+template<typename Unit, typename Type>
+struct is_quantity<quantity<Unit, Type>> : std::true_type
 {
 };
 } // namespace detail
 
 template<typename T>
-inline constexpr bool is_quantity_v = detail::is_quantity<T>::value;
+concept Quantity = detail::is_quantity<T>::value;
 
 template<typename Unit, typename Type>
 struct quantity
@@ -32,7 +32,7 @@ struct quantity
 
   using unit = Unit;
   using type = Type;
-  using self_type = quantity<unit, type>;
+  using self_type = quantity;
 
   template<typename T>
   using as_type = quantity<unit, T>;
@@ -42,25 +42,19 @@ struct quantity
   {
   }
 
-  constexpr quantity(const quantity<unit, type>& rhs) noexcept
+  constexpr quantity(const quantity& rhs) noexcept
       : value{rhs.value}
   {
   }
 
-  constexpr quantity<unit, type>& operator=(const self_type& rhs) noexcept
+  constexpr quantity& operator=(const self_type& rhs) noexcept
   {
     value = rhs.value;
     return *this;
   }
 
   template<typename T>
-  explicit quantity(T)
-  {
-    // must use T here, otherwise the static assert will trigger always
-    // cppcheck-suppress unsignedLessThanZero
-    static_assert(sizeof(T) < 0, // NOLINT(bugprone-sizeof-expression)
-                  "Can only construct a quantity from its defined value type");
-  }
+  explicit quantity(T) = delete;
 
   [[nodiscard]] std::string toString() const
   {
@@ -76,14 +70,14 @@ struct quantity
   template<typename T>
   [[nodiscard]] constexpr auto cast() const
   {
-    if constexpr(!is_quantity_v<T>)
+    if constexpr(!Quantity<T>)
     {
       return quantity<Unit, T>{get<T>()};
     }
     else
     {
       static_assert(std::is_same_v<typename T::unit, unit>, "Unit mismatch");
-      return quantity<unit, typename T::type>{static_cast<typename T::type>(value)};
+      return quantity<unit, typename T::type>{static_cast<T::type>(value)};
     }
   }
 
@@ -170,7 +164,7 @@ struct quantity
 };
 
 template<typename Unit, typename Type>
-constexpr std::enable_if_t<std::is_signed_v<Type>, quantity<Unit, Type>>
+requires std::is_signed_v<Type> constexpr quantity<Unit, Type>
   operator-(quantity<Unit, Type> l) noexcept(noexcept(-l.get()))
 {
   return quantity<Unit, Type>{static_cast<Type>(-l.get())};
@@ -184,4 +178,11 @@ constexpr quantity<Unit, Type> abs(const quantity<Unit, Type>& v) noexcept(noexc
   else
     return v;
 }
+
+template<typename Unit, typename Type>
+[[nodiscard]] constexpr quantity<Unit, Type>
+  lerp(const quantity<Unit, Type>& a, const quantity<Unit, Type>& b, const float alpha)
+{
+  return quantity<Unit, Type>{static_cast<Type>(a.get() * (1 - alpha) + b.get() * alpha)};
+}
 } // namespace qs
diff --git a/src/qs/stream.h b/src/qs/stream.h
index aa1141396..14070838b 100644
--- a/src/qs/stream.h
+++ b/src/qs/stream.h
@@ -7,7 +7,7 @@
 namespace qs
 {
 template<typename Unit, typename Type>
-inline std::ostream& operator<<(std::ostream& o, quantity<Unit, Type> q)
+std::ostream& operator<<(std::ostream& o, quantity<Unit, Type> q)
 {
   return o << q.get() << Unit::suffix();
 }
diff --git a/src/qs/string_util.h b/src/qs/string_util.h
index 8de81b336..4cc048ff4 100644
--- a/src/qs/string_util.h
+++ b/src/qs/string_util.h
@@ -23,7 +23,7 @@ struct unit_suffix_helper<U>
 };
 
 template<typename... Units>
-inline std::string suffix()
+std::string suffix()
 {
   return unit_suffix_helper<Units...>::suffix();
 }
diff --git a/src/qs/test.cpp b/src/qs/test.cpp
index 83203045a..d9b0c7ffc 100644
--- a/src/qs/test.cpp
+++ b/src/qs/test.cpp
@@ -53,17 +53,16 @@ BOOST_AUTO_TEST_CASE(test_drop_all_once_t)
 
 BOOST_AUTO_TEST_CASE(test_symmetric_difference)
 {
-  TEST_SAME(TPL(typename symmetric_difference<std::tuple<int, short>, std::tuple<char>>::reduced_l),
+  TEST_SAME(TPL(symmetric_difference<std::tuple<int, short>, std::tuple<char>>::reduced_l),
             TPL(std::tuple<int, short>));
-  TEST_SAME(TPL(typename symmetric_difference<std::tuple<int, short>, std::tuple<char>>::reduced_r), std::tuple<char>);
-  TEST_SAME(TPL(typename symmetric_difference<std::tuple<short>, std::tuple<short, int>>::reduced_l), std::tuple<>);
-  TEST_SAME(TPL(typename symmetric_difference<std::tuple<short>, std::tuple<short, int>>::reduced_r), std::tuple<int>);
-  TEST_SAME(TPL(typename symmetric_difference<std::tuple<short, short, int>, std::tuple<short, int>>::reduced_l),
+  TEST_SAME(TPL(symmetric_difference<std::tuple<int, short>, std::tuple<char>>::reduced_r), std::tuple<char>);
+  TEST_SAME(TPL(symmetric_difference<std::tuple<short>, std::tuple<short, int>>::reduced_l), std::tuple<>);
+  TEST_SAME(TPL(symmetric_difference<std::tuple<short>, std::tuple<short, int>>::reduced_r), std::tuple<int>);
+  TEST_SAME(TPL(symmetric_difference<std::tuple<short, short, int>, std::tuple<short, int>>::reduced_l),
             std::tuple<short>);
-  TEST_SAME(TPL(typename symmetric_difference<std::tuple<short, short, int>, std::tuple<short, int>>::reduced_r),
-            std::tuple<>);
-  TEST_SAME(TPL(typename symmetric_difference<std::tuple<short>, std::tuple<>>::reduced_l), std::tuple<short>);
-  TEST_SAME(TPL(typename symmetric_difference<std::tuple<short>, std::tuple<>>::reduced_r), std::tuple<>);
+  TEST_SAME(TPL(symmetric_difference<std::tuple<short, short, int>, std::tuple<short, int>>::reduced_r), std::tuple<>);
+  TEST_SAME(TPL(symmetric_difference<std::tuple<short>, std::tuple<>>::reduced_l), std::tuple<short>);
+  TEST_SAME(TPL(symmetric_difference<std::tuple<short>, std::tuple<>>::reduced_r), std::tuple<>);
 }
 
 BOOST_AUTO_TEST_CASE(test_fraction_unit_t)
diff --git a/src/qs/tuple_util.h b/src/qs/tuple_util.h
index 5a300cbba..cb3799ec8 100644
--- a/src/qs/tuple_util.h
+++ b/src/qs/tuple_util.h
@@ -38,7 +38,7 @@ struct drop_one<T, std::tuple<A, Args...>>
 };
 
 template<typename T, typename Tuple>
-using drop_one_t = typename drop_one<T, Tuple>::type;
+using drop_one_t = drop_one<T, Tuple>::type;
 
 template<typename>
 struct first_type;
@@ -50,7 +50,7 @@ struct first_type<std::tuple<T, Args...>>
 };
 
 template<typename T>
-using first_t = typename first_type<T>::type;
+using first_t = first_type<T>::type;
 
 template<typename>
 struct except_first;
@@ -62,12 +62,12 @@ struct except_first<std::tuple<T, Args...>>
 };
 
 template<typename T>
-using except_first_t = typename except_first<T>::type;
+using except_first_t = except_first<T>::type;
 
 template<typename Needles, typename Haystack>
 struct drop_all_once
 {
-  using type = typename drop_all_once<except_first_t<Needles>, drop_one_t<first_t<Needles>, Haystack>>::type;
+  using type = drop_all_once<except_first_t<Needles>, drop_one_t<first_t<Needles>, Haystack>>::type;
 };
 
 template<>
@@ -89,7 +89,7 @@ struct drop_all_once<std::tuple<>, Haystack>
 };
 
 template<typename T, typename U>
-using drop_all_once_t = typename drop_all_once<T, U>::type;
+using drop_all_once_t = drop_all_once<T, U>::type;
 
 template<typename L, typename R>
 struct symmetric_difference;
diff --git a/src/render/material/bufferparameter.cpp b/src/render/material/bufferparameter.cpp
index 844214c57..4fb01093e 100644
--- a/src/render/material/bufferparameter.cpp
+++ b/src/render/material/bufferparameter.cpp
@@ -51,6 +51,17 @@ void BufferParameter::bindBoneTransformBuffer(const std::function<bool()>& smoot
   };
 }
 
+void BufferParameter::bindNextBoneTransformBuffer(const std::function<bool()>& smooth)
+{
+  m_bufferBinder = [smooth](const scene::Node* node, const scene::Mesh& /*mesh*/, gl::ShaderStorageBlock& ssb)
+  {
+    if(const auto* mo = dynamic_cast<const engine::SkeletalModelNode*>(node))
+      ssb.bind(mo->getNextMeshMatricesBuffer(smooth));
+    else if(const auto* go = dynamic_cast<const engine::ghosting::GhostModel*>(node))
+      ssb.bind(go->getMeshMatricesBuffer());
+  };
+}
+
 gl::ShaderStorageBlock* BufferParameter::findShaderStorageBlock(ShaderProgram& shaderProgram) const
 {
   if(const auto block = shaderProgram.findShaderStorageBlock(getName()))
diff --git a/src/render/material/bufferparameter.h b/src/render/material/bufferparameter.h
index 85e459e9b..20d667b25 100644
--- a/src/render/material/bufferparameter.h
+++ b/src/render/material/bufferparameter.h
@@ -62,6 +62,7 @@ class BufferParameter : public MaterialParameter
 
   bool bind(const scene::Node* node, const scene::Mesh& mesh, ShaderProgram& shaderProgram) override;
   void bindBoneTransformBuffer(const std::function<bool()>& smooth);
+  void bindNextBoneTransformBuffer(const std::function<bool()>& smooth);
 
 private:
   [[nodiscard]] gl::ShaderStorageBlock* findShaderStorageBlock(ShaderProgram& shaderProgram) const;
diff --git a/src/render/material/material.cpp b/src/render/material/material.cpp
index 116c1a283..ce470f11b 100644
--- a/src/render/material/material.cpp
+++ b/src/render/material/material.cpp
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <boost/log/trivial.hpp>
 #include <gl/program.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <utility>
@@ -74,12 +74,11 @@ void Material::bind(const scene::Node* node, const scene::Mesh& mesh) const
 
 std::shared_ptr<UniformParameter> Material::tryGetUniform(const std::string& name) const
 {
-  auto it = std::find_if(m_uniforms.begin(),
-                         m_uniforms.end(),
-                         [&name](const auto& param)
-                         {
-                           return param->getName() == name;
-                         });
+  const auto it = std::ranges::find_if(m_uniforms,
+                                       [&name](const auto& param)
+                                       {
+                                         return param->getName() == name;
+                                       });
   if(it != m_uniforms.end())
     return *it;
 
@@ -93,12 +92,11 @@ std::shared_ptr<UniformParameter> Material::tryGetUniform(const std::string& nam
 
 std::shared_ptr<UniformBlockParameter> Material::tryGetUniformBlock(const std::string& name) const
 {
-  auto it = std::find_if(m_uniformBlocks.begin(),
-                         m_uniformBlocks.end(),
-                         [&name](const auto& param)
-                         {
-                           return param->getName() == name;
-                         });
+  const auto it = std::ranges::find_if(m_uniformBlocks,
+                                       [&name](const auto& param)
+                                       {
+                                         return param->getName() == name;
+                                       });
   if(it != m_uniformBlocks.end())
     return *it;
 
@@ -111,12 +109,11 @@ std::shared_ptr<UniformBlockParameter> Material::tryGetUniformBlock(const std::s
 
 std::shared_ptr<BufferParameter> Material::tryGetBuffer(const std::string& name) const
 {
-  auto it = std::find_if(m_buffers.begin(),
-                         m_buffers.end(),
-                         [&name](const auto& param)
-                         {
-                           return param->getName() == name;
-                         });
+  const auto it = std::ranges::find_if(m_buffers,
+                                       [&name](const auto& param)
+                                       {
+                                         return param->getName() == name;
+                                       });
   if(it != m_buffers.end())
     return *it;
 
@@ -126,4 +123,4 @@ std::shared_ptr<BufferParameter> Material::tryGetBuffer(const std::string& name)
   m_buffers.emplace_back(param);
   return param;
 }
-} // namespace render::material
+} // namespace render::material
\ No newline at end of file
diff --git a/src/render/material/material.h b/src/render/material/material.h
index e0f515ace..b583cac20 100644
--- a/src/render/material/material.h
+++ b/src/render/material/material.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -40,21 +40,24 @@ class Material final
   void bind(const scene::Node* node, const scene::Mesh& mesh) const;
 
   [[nodiscard]] std::shared_ptr<UniformParameter> tryGetUniform(const std::string& name) const;
+
   [[nodiscard]] gslu::nn_shared<UniformParameter> getUniform(const std::string& name) const
   {
-    return gsl::not_null{tryGetUniform(name)};
+    return gsl_lite::not_null{tryGetUniform(name)};
   }
 
   [[nodiscard]] std::shared_ptr<UniformBlockParameter> tryGetUniformBlock(const std::string& name) const;
+
   [[nodiscard]] gslu::nn_shared<UniformBlockParameter> getUniformBlock(const std::string& name) const
   {
-    return gsl::not_null{tryGetUniformBlock(name)};
+    return gsl_lite::not_null{tryGetUniformBlock(name)};
   }
 
   [[nodiscard]] std::shared_ptr<BufferParameter> tryGetBuffer(const std::string& name) const;
+
   [[nodiscard]] gslu::nn_shared<BufferParameter> getBuffer(const std::string& name) const
   {
-    return gsl::not_null{tryGetBuffer(name)};
+    return gsl_lite::not_null{tryGetBuffer(name)};
   }
 
   [[nodiscard]] gl::RenderState& getRenderState()
@@ -71,4 +74,4 @@ class Material final
 
   gl::RenderState m_renderState;
 };
-} // namespace render::material
+} // namespace render::material
\ No newline at end of file
diff --git a/src/render/material/materialmanager.cpp b/src/render/material/materialmanager.cpp
index f68c1867d..6449b6fc4 100644
--- a/src/render/material/materialmanager.cpp
+++ b/src/render/material/materialmanager.cpp
@@ -4,7 +4,7 @@
 #include "material.h"
 #include "render/scene/csm.h"
 #include "render/scene/node.h"
-#include "render/scene/renderer.h"
+#include "render/scene/scenegraph.h"
 #include "shadercache.h"
 #include "spritematerialmode.h"
 #include "uniformparameter.h"
@@ -27,7 +27,7 @@
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -46,7 +46,7 @@ namespace render::material
 {
 namespace
 {
-void configureForScreenSpaceEffect(Material& m, bool enableBlend)
+void configureForScreenSpaceEffect(Material& m, const bool enableBlend)
 {
   m.getRenderState().setDepthTest(false);
   m.getRenderState().setDepthWrite(false);
@@ -58,27 +58,27 @@ void configureForScreenSpaceEffect(Material& m, bool enableBlend)
 
 struct alignas(sizeof(uint64_t)) MaterialManager::CsmHandleContainer
 {
-  std::array<glm::uvec4, render::scene::CSMBuffer::NSplits> handles;
+  std::array<glm::uvec4, scene::CSMBuffer::NSplits> handles;
 };
 
 gslu::nn_shared<Material> MaterialManager::getSprite(SpriteMaterialMode mode,
                                                      const std::function<int32_t()>& lightingMode)
 {
-  if(auto it = m_sprite.find(mode); it != m_sprite.end())
+  if(const auto it = m_sprite.find(mode); it != m_sprite.end())
     return it->second;
 
-  auto m
-    = gsl::make_shared<Material>(m_shaderCache->getGeometry(false, false, true, false, static_cast<uint8_t>(mode)));
+  auto m = gsl_lite::make_shared<Material>(
+    m_shaderCache->getGeometry(false, false, true, false, static_cast<uint8_t>(mode)));
   m->getRenderState().setCullFace(false);
 
   if(mode != SpriteMaterialMode::InstancedBillboard)
     m->getUniformBlock("Transform")->bindTransformBuffer();
-  m->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
+  m->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
   m->getUniform("u_diffuseTextures")
     ->bind(
       [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
       {
-        uniform.set(gsl::not_null{m_geometryTexturesHandle});
+        uniform.set(gsl_lite::not_null{m_geometryTexturesHandle});
       });
   m->getUniform("u_lightingMode")
     ->bind(
@@ -91,9 +91,10 @@ gslu::nn_shared<Material> MaterialManager::getSprite(SpriteMaterialMode mode,
   return m;
 }
 
-gslu::nn_shared<Material> MaterialManager::getCSMDepthOnly(bool skeletal, const std::function<bool()>& smooth)
+gslu::nn_shared<Material> MaterialManager::getCSMDepthOnly(const bool skeletal,
+                                                           const std::function<bool()>& smooth) const
 {
-  auto m = gsl::make_shared<Material>(m_shaderCache->getCSMDepthOnly(skeletal));
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getCSMDepthOnly(skeletal));
   m->getUniform("u_mvp")->bind(
     [this](const scene::Node* node, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
     {
@@ -105,52 +106,76 @@ gslu::nn_shared<Material> MaterialManager::getCSMDepthOnly(bool skeletal, const
   m->getRenderState().setDepthWrite(true);
   m->getRenderState().setDepthClamp(true);
   m->getRenderState().setCullFaceSide(gl::api::TriangleFace::Front);
-  if(auto buffer = m->tryGetBuffer("BoneTransform"))
+  if(const auto buffer = m->tryGetBuffer("BoneTransform"))
     buffer->bindBoneTransformBuffer(smooth);
+  if(const auto buffer = m->tryGetBuffer("NextBoneTransform"))
+    buffer->bindNextBoneTransformBuffer(smooth);
+  if(const auto uniform = m->tryGetUniform("u_interTickFactor"))
+    uniform->bind(
+      [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+      {
+        uniform.set(m_interTickFactorProvider());
+      });
 
   return m;
 }
 
-gslu::nn_shared<Material> MaterialManager::getDepthOnly(bool skeletal, const std::function<bool()>& smooth)
+gslu::nn_shared<Material> MaterialManager::getDepthOnly(const bool skeletal, const std::function<bool()>& smooth) const
 {
-  auto m = gsl::make_shared<Material>(m_shaderCache->getDepthOnly(skeletal));
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getDepthOnly(skeletal));
   m->getRenderState().setDepthTest(true);
   m->getRenderState().setDepthWrite(true);
   m->getUniformBlock("Transform")->bindTransformBuffer();
-  m->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
-  if(auto buffer = m->tryGetBuffer("BoneTransform"))
+  m->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
+  if(const auto buffer = m->tryGetBuffer("BoneTransform"))
     buffer->bindBoneTransformBuffer(smooth);
+  if(const auto buffer = m->tryGetBuffer("NextBoneTransform"))
+    buffer->bindNextBoneTransformBuffer(smooth);
+  if(const auto uniform = m->tryGetUniform("u_interTickFactor"))
+    uniform->bind(
+      [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+      {
+        uniform.set(m_interTickFactorProvider());
+      });
   m->getUniform("u_diffuseTextures")
     ->bind(
       [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
       {
-        uniform.set(gsl::not_null{m_geometryTexturesHandle});
+        uniform.set(gsl_lite::not_null{m_geometryTexturesHandle});
       });
 
   return m;
 }
 
-gslu::nn_shared<Material> MaterialManager::getGeometry(bool inWater,
-                                                       bool skeletal,
-                                                       bool roomShadowing,
-                                                       bool opaque,
+gslu::nn_shared<Material> MaterialManager::getGeometry(const bool inWater,
+                                                       const bool skeletal,
+                                                       const bool roomShadowing,
+                                                       const bool opaque,
                                                        const std::function<bool()>& smooth,
                                                        const std::function<int32_t()>& lightingMode)
 {
   gsl_Expects(m_geometryTexturesHandle != nullptr);
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getGeometry(inWater, skeletal, roomShadowing, opaque, 0));
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getGeometry(inWater, skeletal, roomShadowing, opaque, 0));
   m->getUniform("u_diffuseTextures")
     ->bind(
       [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
       {
-        uniform.set(gsl::not_null{m_geometryTexturesHandle});
+        uniform.set(gsl_lite::not_null{m_geometryTexturesHandle});
       });
 
   m->getUniformBlock("Transform")->bindTransformBuffer();
-  if(auto buffer = m->tryGetBuffer("BoneTransform"))
+  if(const auto buffer = m->tryGetBuffer("BoneTransform"))
     buffer->bindBoneTransformBuffer(smooth);
-  m->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
+  if(const auto buffer = m->tryGetBuffer("NextBoneTransform"))
+    buffer->bindNextBoneTransformBuffer(smooth);
+  if(const auto uniform = m->tryGetUniform("u_interTickFactor"))
+    uniform->bind(
+      [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+      {
+        uniform.set(m_interTickFactorProvider());
+      });
+  m->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
   m->getUniformBlock("CSM")->bind(
     [this](const scene::Node* node, const scene::Mesh& /*mesh*/, gl::UniformBlock& ub)
     {
@@ -160,15 +185,15 @@ gslu::nn_shared<Material> MaterialManager::getGeometry(bool inWater,
     });
 
   m->getUniformBlock("CSMVSM")->bind(
-    [this](const render::scene::Node*, const render::scene::Mesh& /*mesh*/, gl::UniformBlock& uniformBlock)
+    [this](const scene::Node*, const scene::Mesh& /*mesh*/, gl::UniformBlock& uniformBlock)
     {
       BOOST_ASSERT(m_csm != nullptr);
       if(m_csmBuffer == nullptr)
         m_csmBuffer = std::make_shared<gl::UniformBuffer<CsmHandleContainer>>(
           "csm-handles", gl::api::BufferUsage::StreamDraw, sizeof(CsmHandleContainer));
       CsmHandleContainer data{};
-      auto textures = m_csm->getTextures();
-      for(size_t i = 0; i < render::scene::CSMBuffer::NSplits; ++i)
+      const auto textures = m_csm->getTextures();
+      for(size_t i = 0; i < scene::CSMBuffer::NSplits; ++i)
         *reinterpret_cast<uint64_t*>(&data.handles[i]) = textures[i]->getHandle();
       m_csmBuffer->setSubData(data, 0);
       uniformBlock.bind(*m_csmBuffer);
@@ -181,18 +206,7 @@ gslu::nn_shared<Material> MaterialManager::getGeometry(bool inWater,
         uniform.set(lightingMode());
       });
 
-  if(auto uniform = m->tryGetUniform("u_noise"))
-    uniform->set(gsl::not_null{m_noiseTexture});
-
-  if(auto uniform = m->tryGetUniform("u_time"))
-  {
-    uniform->bind(
-      [renderer = m_renderer](const scene::Node*, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
-      {
-        const auto now = std::chrono::time_point_cast<std::chrono::milliseconds>(renderer->getGameTime());
-        uniform.set(gsl::narrow_cast<float>(now.time_since_epoch().count()));
-      });
-  }
+  bindNoiseAndTime(*m);
 
   return m;
 }
@@ -200,12 +214,21 @@ gslu::nn_shared<Material> MaterialManager::getGeometry(bool inWater,
 gslu::nn_shared<Material> MaterialManager::getGhost(const std::function<bool()>& smooth)
 {
   if(m_ghost != nullptr)
-    return gsl::not_null{m_ghost};
+    return gsl_lite::not_null{m_ghost};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getGhost());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getGhost());
   m->getUniformBlock("Transform")->bindTransformBuffer();
   m->getBuffer("BoneTransform")->bindBoneTransformBuffer(smooth);
-  m->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
+  m->getBuffer("NextBoneTransform")->bindNextBoneTransformBuffer(smooth);
+  if(const auto uniform = m->tryGetUniform("u_interTickFactor"); uniform != nullptr)
+  {
+    uniform->bind(
+      [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+      {
+        uniform.set(m_interTickFactorProvider());
+      });
+  }
+  m->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
   m_ghost = m;
   return m;
 }
@@ -213,58 +236,60 @@ gslu::nn_shared<Material> MaterialManager::getGhost(const std::function<bool()>&
 gslu::nn_shared<Material> MaterialManager::getWaterSurface()
 {
   if(m_waterSurface != nullptr)
-    return gsl::not_null{m_waterSurface};
+    return gsl_lite::not_null{m_waterSurface};
 
   m_waterSurface = std::make_shared<Material>(m_shaderCache->getWaterSurface());
   m_waterSurface->getRenderState().setCullFace(false);
   m_waterSurface->getRenderState().setBlend(0, false);
   m_waterSurface->getRenderState().setBlend(1, false);
 
-  m_waterSurface->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
-  m_waterSurface->getUniform("u_time")->bind(
-    [renderer = m_renderer](const scene::Node*, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
-    {
-      const auto now = std::chrono::time_point_cast<std::chrono::milliseconds>(renderer->getGameTime());
-      uniform.set(gsl::narrow_cast<float>(now.time_since_epoch().count()));
-    });
+  m_waterSurface->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
+  bindNoiseAndTime(*m_waterSurface);
 
-  m_waterSurface->getUniform("u_noise")->set(gsl::not_null{m_noiseTexture});
+  bindNoiseAndTime(*m_waterSurface);
 
-  return gsl::not_null{m_waterSurface};
+  return gsl_lite::not_null{m_waterSurface};
 }
 
 gslu::nn_shared<Material> MaterialManager::getLightning()
 {
   if(m_lightning != nullptr)
-    return gsl::not_null{m_lightning};
+    return gsl_lite::not_null{m_lightning};
 
   m_lightning = std::make_shared<Material>(m_shaderCache->getLightning());
   m_lightning->getUniformBlock("Transform")->bindTransformBuffer();
-  m_lightning->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
+  m_lightning->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
 
-  return gsl::not_null{m_lightning};
+  return gsl_lite::not_null{m_lightning};
 }
 
-MaterialManager::MaterialManager(gslu::nn_shared<ShaderCache> shaderCache, gslu::nn_shared<scene::Renderer> renderer)
+MaterialManager::MaterialManager(gslu::nn_shared<ShaderCache> shaderCache,
+                                 gslu::nn_shared<scene::Camera> camera,
+                                 std::function<float()> interTickFactorProvider,
+                                 std::function<std::chrono::high_resolution_clock::time_point()> gameTimeProvider)
     : m_shaderCache{std::move(shaderCache)}
-    , m_renderer{std::move(renderer)}
+    , m_camera{std::move(camera)}
+    , m_interTickFactorProvider{std::move(interTickFactorProvider)}
+    , m_gameTimeProvider{std::move(gameTimeProvider)}
 {
   static constexpr size_t NoiseTextureSize = 128;
-  std::vector<gl::RGB8> noiseData;
+  std::vector<gl::RGBA8> noiseData;
   noiseData.resize(NoiseTextureSize * NoiseTextureSize);
   std::default_random_engine generator{}; // NOLINT(cert-msc32-c, cert-msc51-cpp)
   std::uniform_int_distribution<uint16_t> randomInts(0, 255);
   for(auto& i : noiseData)
   {
-    const auto value = randomInts(generator);
-    i = gl::RGB8{gsl::narrow_cast<uint8_t>(value), gsl::narrow_cast<uint8_t>(value), gsl::narrow_cast<uint8_t>(value)};
+    i = gl::RGBA8{gsl_lite::narrow_cast<uint8_t>(randomInts(generator)),
+                  gsl_lite::narrow_cast<uint8_t>(randomInts(generator)),
+                  gsl_lite::narrow_cast<uint8_t>(randomInts(generator)),
+                  gsl_lite::narrow_cast<uint8_t>(randomInts(generator))};
   }
 
-  auto noiseTexture = gsl::make_shared<gl::Texture2D<gl::RGB8>>(glm::ivec2{NoiseTextureSize}, "noise");
+  auto noiseTexture = gsl_lite::make_shared<gl::Texture2D<gl::RGBA8>>(glm::ivec2{NoiseTextureSize}, "noise");
   noiseTexture->assign(noiseData);
-  m_noiseTexture = std::make_shared<gl::TextureHandle<gl::Texture2D<gl::RGB8>>>(
+  m_noiseTexture = std::make_shared<gl::TextureHandle<gl::Texture2D<gl::RGBA8>>>(
     noiseTexture,
-    gsl::make_unique<gl::Sampler>("noise" + gl::SamplerSuffix)
+    gsl_lite::make_unique<gl::Sampler>("noise" + gl::SamplerSuffix)
       | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::MirroredRepeat)
       | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::MirroredRepeat)
       | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear));
@@ -273,22 +298,11 @@ MaterialManager::MaterialManager(gslu::nn_shared<ShaderCache> shaderCache, gslu:
 gslu::nn_shared<Material> MaterialManager::getWorldComposition(bool inWater, bool dof)
 {
   const std::tuple key{inWater, dof};
-  if(auto it = m_composition.find(key); it != m_composition.end())
+  if(const auto it = m_composition.find(key); it != m_composition.end())
     return it->second;
-  auto m = gsl::make_shared<Material>(m_shaderCache->getWorldComposition(inWater, dof));
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getWorldComposition(inWater, dof));
 
-  if(auto uniform = m->tryGetUniform("u_time"))
-  {
-    uniform->bind(
-      [renderer = m_renderer](const scene::Node*, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
-      {
-        const auto now = std::chrono::time_point_cast<std::chrono::milliseconds>(renderer->getGameTime());
-        uniform.set(gsl::narrow_cast<float>(now.time_since_epoch().count()));
-      });
-  }
-
-  if(auto uniform = m->tryGetUniform("u_noise"))
-    uniform->set(gsl::not_null{m_noiseTexture});
+  bindNoiseAndTime(*m);
 
   configureForScreenSpaceEffect(*m, false);
 
@@ -299,31 +313,31 @@ gslu::nn_shared<Material> MaterialManager::getWorldComposition(bool inWater, boo
 gslu::nn_shared<Material> MaterialManager::getUi()
 {
   if(m_ui != nullptr)
-    return gsl::not_null{m_ui};
+    return gsl_lite::not_null{m_ui};
 
-  auto m = std::make_shared<Material>(m_shaderCache->getUi());
+  const auto m = std::make_shared<Material>(m_shaderCache->getUi());
   m->getUniform("u_input")->bind(
     [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
     {
-      uniform.set(gsl::not_null{m_geometryTexturesHandle});
+      uniform.set(gsl_lite::not_null{m_geometryTexturesHandle});
     });
-  m->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
+  m->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
   configureForScreenSpaceEffect(*m, true);
   m_ui = m;
-  return gsl::not_null{m_ui};
+  return gsl_lite::not_null{m_ui};
 }
 
 gslu::nn_shared<Material> MaterialManager::getFlat(bool withAlpha, bool invertY, bool withAspectRatio)
 {
   const std::tuple key{withAlpha, invertY, withAspectRatio};
-  if(auto it = m_flat.find(key); it != m_flat.end())
+  if(const auto it = m_flat.find(key); it != m_flat.end())
     return it->second;
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getFlat(withAlpha, invertY, withAspectRatio));
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getFlat(withAlpha, invertY, withAspectRatio));
   m->getRenderState().setBlend(0, withAlpha);
   m->getRenderState().setBlendFactors(0, gl::api::BlendingFactor::One, gl::api::BlendingFactor::OneMinusSrcAlpha);
   if(const auto uniformBlock = m->tryGetUniformBlock("Camera"))
-    uniformBlock->bindCameraBuffer(m_renderer->getCamera());
+    uniformBlock->bindCameraBuffer(m_camera);
   configureForScreenSpaceEffect(*m, withAlpha);
   m_flat.emplace(key, m);
   return m;
@@ -331,11 +345,11 @@ gslu::nn_shared<Material> MaterialManager::getFlat(bool withAlpha, bool invertY,
 
 gslu::nn_shared<Material> MaterialManager::getBackdrop(bool withAlphaMultiplier)
 {
-  if(auto it = m_backdrop.find(withAlphaMultiplier); it != m_backdrop.end())
+  if(const auto it = m_backdrop.find(withAlphaMultiplier); it != m_backdrop.end())
     return it->second;
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getBackdrop(withAlphaMultiplier));
-  m->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getBackdrop(withAlphaMultiplier));
+  m->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
   configureForScreenSpaceEffect(*m, withAlphaMultiplier);
   m_backdrop.emplace(withAlphaMultiplier, m);
   return m;
@@ -343,10 +357,10 @@ gslu::nn_shared<Material> MaterialManager::getBackdrop(bool withAlphaMultiplier)
 
 gslu::nn_shared<Material> MaterialManager::getFXAA(uint8_t preset)
 {
-  if(auto it = m_fxaa.find(preset); it != m_fxaa.end())
+  if(const auto it = m_fxaa.find(preset); it != m_fxaa.end())
     return it->second;
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getFXAA(preset));
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getFXAA(preset));
   configureForScreenSpaceEffect(*m, false);
   m_fxaa.emplace(preset, m);
   return m;
@@ -355,10 +369,10 @@ gslu::nn_shared<Material> MaterialManager::getFXAA(uint8_t preset)
 gslu::nn_shared<Material> MaterialManager::getCRTV0()
 {
   if(m_crtV0 != nullptr)
-    return gsl::not_null{m_crtV0};
+    return gsl_lite::not_null{m_crtV0};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getCRTV0());
-  m->getUniform("u_noise")->set(gsl::not_null{m_noiseTexture});
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getCRTV0());
+  bindNoiseAndTime(*m);
   configureForScreenSpaceEffect(*m, false);
   m_crtV0 = m;
   return m;
@@ -367,9 +381,9 @@ gslu::nn_shared<Material> MaterialManager::getCRTV0()
 gslu::nn_shared<Material> MaterialManager::getCRTV1()
 {
   if(m_crtV1 != nullptr)
-    return gsl::not_null{m_crtV1};
+    return gsl_lite::not_null{m_crtV1};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getCRTV1());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getCRTV1());
   configureForScreenSpaceEffect(*m, false);
   m_crtV1 = m;
   return m;
@@ -377,11 +391,11 @@ gslu::nn_shared<Material> MaterialManager::getCRTV1()
 
 gslu::nn_shared<Material> MaterialManager::getBrightnessContrast(int8_t brightness, int8_t contrast)
 {
-  const std::tuple<int8_t, int8_t> key{brightness, contrast};
-  if(auto it = m_brightnessContrast.find(key); it != m_brightnessContrast.end())
+  const std::tuple key{brightness, contrast};
+  if(const auto it = m_brightnessContrast.find(key); it != m_brightnessContrast.end())
     return it->second;
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getBrightnessContrast(brightness, contrast));
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getBrightnessContrast(brightness, contrast));
   configureForScreenSpaceEffect(*m, false);
   m_brightnessContrast.emplace(key, m);
   return m;
@@ -390,9 +404,9 @@ gslu::nn_shared<Material> MaterialManager::getBrightnessContrast(int8_t brightne
 gslu::nn_shared<Material> MaterialManager::getVelvia()
 {
   if(m_velvia != nullptr)
-    return gsl::not_null{m_velvia};
+    return gsl_lite::not_null{m_velvia};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getVelvia());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getVelvia());
   configureForScreenSpaceEffect(*m, false);
   m_velvia = m;
   return m;
@@ -401,9 +415,9 @@ gslu::nn_shared<Material> MaterialManager::getVelvia()
 gslu::nn_shared<Material> MaterialManager::getDeath()
 {
   if(m_death != nullptr)
-    return gsl::not_null{m_death};
+    return gsl_lite::not_null{m_death};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getDeath());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getDeath());
   configureForScreenSpaceEffect(*m, false);
   m_death = m;
   return m;
@@ -412,10 +426,10 @@ gslu::nn_shared<Material> MaterialManager::getDeath()
 gslu::nn_shared<Material> MaterialManager::getFilmGrain()
 {
   if(m_filmGrain != nullptr)
-    return gsl::not_null{m_filmGrain};
+    return gsl_lite::not_null{m_filmGrain};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getFilmGrain());
-  m->getUniform("u_noise")->set(gsl::not_null{m_noiseTexture});
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getFilmGrain());
+  bindNoiseAndTime(*m);
   configureForScreenSpaceEffect(*m, false);
   m_filmGrain = m;
   return m;
@@ -424,10 +438,10 @@ gslu::nn_shared<Material> MaterialManager::getFilmGrain()
 gslu::nn_shared<Material> MaterialManager::getLensDistortion()
 {
   if(m_lensDistortion != nullptr)
-    return gsl::not_null{m_lensDistortion};
+    return gsl_lite::not_null{m_lensDistortion};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getLensDistortion());
-  m->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getLensDistortion());
+  m->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
 
   m_lensDistortion = m;
   return m;
@@ -436,10 +450,10 @@ gslu::nn_shared<Material> MaterialManager::getLensDistortion()
 gslu::nn_shared<Material> MaterialManager::getMasking(bool ao, bool edges)
 {
   const std::tuple key{ao, edges};
-  if(auto it = m_masking.find(key); it != m_masking.end())
+  if(const auto it = m_masking.find(key); it != m_masking.end())
     return it->second;
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getMasking(ao, edges));
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getMasking(ao, edges));
   m_masking.emplace(key, m);
   return m;
 }
@@ -447,9 +461,9 @@ gslu::nn_shared<Material> MaterialManager::getMasking(bool ao, bool edges)
 gslu::nn_shared<Material> MaterialManager::getUnderwaterMovement()
 {
   if(m_underwaterMovement != nullptr)
-    return gsl::not_null{m_underwaterMovement};
+    return gsl_lite::not_null{m_underwaterMovement};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getUnderwaterMovement());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getUnderwaterMovement());
   m_underwaterMovement = m;
   return m;
 }
@@ -457,9 +471,9 @@ gslu::nn_shared<Material> MaterialManager::getUnderwaterMovement()
 gslu::nn_shared<Material> MaterialManager::getReflective()
 {
   if(m_reflective != nullptr)
-    return gsl::not_null{m_reflective};
+    return gsl_lite::not_null{m_reflective};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getReflective());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getReflective());
   configureForScreenSpaceEffect(*m, false);
   m_reflective = m;
   return m;
@@ -468,9 +482,9 @@ gslu::nn_shared<Material> MaterialManager::getReflective()
 gslu::nn_shared<Material> MaterialManager::getBloom()
 {
   if(m_bloom != nullptr)
-    return gsl::not_null{m_bloom};
+    return gsl_lite::not_null{m_bloom};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getBloom());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getBloom());
   configureForScreenSpaceEffect(*m, false);
   m_bloom = m;
   return m;
@@ -479,10 +493,10 @@ gslu::nn_shared<Material> MaterialManager::getBloom()
 gslu::nn_shared<Material> MaterialManager::getHBAO()
 {
   if(m_hbao != nullptr)
-    return gsl::not_null{m_hbao};
+    return gsl_lite::not_null{m_hbao};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getHBAO());
-  m->getUniform("u_noise")->set(gsl::not_null{m_noiseTexture});
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getHBAO());
+  bindNoiseAndTime(*m);
   configureForScreenSpaceEffect(*m, false);
   m_hbao = m;
   return m;
@@ -491,9 +505,9 @@ gslu::nn_shared<Material> MaterialManager::getHBAO()
 gslu::nn_shared<Material> MaterialManager::getEdgeDetection()
 {
   if(m_edgeDetection != nullptr)
-    return gsl::not_null{m_edgeDetection};
+    return gsl_lite::not_null{m_edgeDetection};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getEdgeDetection());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getEdgeDetection());
   configureForScreenSpaceEffect(*m, false);
   m_edgeDetection = m;
   return m;
@@ -502,9 +516,9 @@ gslu::nn_shared<Material> MaterialManager::getEdgeDetection()
 gslu::nn_shared<Material> MaterialManager::getEdgeDilation()
 {
   if(m_edgeDilation != nullptr)
-    return gsl::not_null{m_edgeDilation};
+    return gsl_lite::not_null{m_edgeDilation};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getEdgeDilation());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getEdgeDilation());
   configureForScreenSpaceEffect(*m, false);
   m_edgeDilation = m;
   return m;
@@ -513,9 +527,9 @@ gslu::nn_shared<Material> MaterialManager::getEdgeDilation()
 gslu::nn_shared<Material> MaterialManager::getVSMSquare()
 {
   if(m_vsmSquare != nullptr)
-    return gsl::not_null{m_vsmSquare};
+    return gsl_lite::not_null{m_vsmSquare};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getVSMSquare());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getVSMSquare());
   configureForScreenSpaceEffect(*m, false);
   m_vsmSquare = m;
   return m;
@@ -527,7 +541,7 @@ void MaterialManager::setGeometryTextures(
   createSampler(geometryTextures, false, std::nullopt);
 }
 
-void MaterialManager::setFiltering(bool bilinear, const std::optional<float>& anisotropyLevel)
+void MaterialManager::setFiltering(const bool bilinear, const std::optional<float>& anisotropyLevel)
 {
   if(m_geometryTexturesHandle == nullptr)
     return;
@@ -538,12 +552,12 @@ void MaterialManager::setFiltering(bool bilinear, const std::optional<float>& an
 gslu::nn_shared<Material> MaterialManager::getFastGaussBlur(uint8_t extent, uint8_t blurDir, uint8_t blurDim)
 {
   const std::tuple key{extent, blurDir, blurDim};
-  if(auto it = m_fastGaussBlur.find(key); it != m_fastGaussBlur.end())
+  if(const auto it = m_fastGaussBlur.find(key); it != m_fastGaussBlur.end())
     return it->second;
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getFastGaussBlur(extent, blurDim));
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getFastGaussBlur(extent, blurDim));
   configureForScreenSpaceEffect(*m, false);
-  m->getUniform("u_blurDir")->set(int(blurDir));
+  m->getUniform("u_blurDir")->set(static_cast<int>(blurDir));
   m_fastGaussBlur.emplace(key, m);
   return m;
 }
@@ -551,12 +565,12 @@ gslu::nn_shared<Material> MaterialManager::getFastGaussBlur(uint8_t extent, uint
 gslu::nn_shared<Material> MaterialManager::getFastBoxBlur(uint8_t extent, uint8_t blurDir, uint8_t blurDim)
 {
   const std::tuple key{extent, blurDir, blurDim};
-  if(auto it = m_fastBoxBlur.find(key); it != m_fastBoxBlur.end())
+  if(const auto it = m_fastBoxBlur.find(key); it != m_fastBoxBlur.end())
     return it->second;
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getFastBoxBlur(extent, blurDim));
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getFastBoxBlur(extent, blurDim));
   configureForScreenSpaceEffect(*m, false);
-  m->getUniform("u_blurDir")->set(int(blurDir));
+  m->getUniform("u_blurDir")->set(static_cast<int>(blurDir));
   m_fastBoxBlur.emplace(key, m);
   return m;
 }
@@ -564,9 +578,9 @@ gslu::nn_shared<Material> MaterialManager::getFastBoxBlur(uint8_t extent, uint8_
 gslu::nn_shared<Material> MaterialManager::getBloomDownsample()
 {
   if(m_bloomDownsample != nullptr)
-    return gsl::not_null{m_bloomDownsample};
+    return gsl_lite::not_null{m_bloomDownsample};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getBloomDownsample());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getBloomDownsample());
   configureForScreenSpaceEffect(*m, false);
   m_bloomDownsample = m;
   return m;
@@ -575,9 +589,9 @@ gslu::nn_shared<Material> MaterialManager::getBloomDownsample()
 gslu::nn_shared<Material> MaterialManager::getBloomUpsample()
 {
   if(m_bloomUpsample != nullptr)
-    return gsl::not_null{m_bloomUpsample};
+    return gsl_lite::not_null{m_bloomUpsample};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getBloomUpsample());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getBloomUpsample());
   configureForScreenSpaceEffect(*m, false);
   m_bloomUpsample = m;
   return m;
@@ -586,23 +600,18 @@ gslu::nn_shared<Material> MaterialManager::getBloomUpsample()
 gslu::nn_shared<Material> MaterialManager::getDustParticle()
 {
   if(m_dustParticle != nullptr)
-    return gsl::not_null{m_dustParticle};
+    return gsl_lite::not_null{m_dustParticle};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getDustParticle());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getDustParticle());
   m->getRenderState().setCullFace(false);
   m->getRenderState().setBlend(0, true);
   m->getRenderState().setBlendFactors(0, gl::api::BlendingFactor::One, gl::api::BlendingFactor::OneMinusSrcAlpha);
   m->getRenderState().setDepthTest(true);
+  m->getRenderState().setDepthFunction(gl::api::DepthFunction::Lequal);
   m->getRenderState().setDepthWrite(false);
-  m->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
+  m->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
   m->getUniformBlock("Transform")->bindTransformBuffer();
-  m->getUniform("u_noise")->set(gsl::not_null{m_noiseTexture});
-  m->getUniform("u_time")->bind(
-    [renderer = m_renderer](const scene::Node*, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
-    {
-      const auto now = std::chrono::time_point_cast<std::chrono::milliseconds>(renderer->getGameTime());
-      uniform.set(gsl::narrow_cast<float>(now.time_since_epoch().count()));
-    });
+  bindNoiseAndTime(*m);
   m_dustParticle = m;
   return m;
 }
@@ -610,9 +619,9 @@ gslu::nn_shared<Material> MaterialManager::getDustParticle()
 gslu::nn_shared<Material> MaterialManager::getGhostName()
 {
   if(m_ghostName != nullptr)
-    return gsl::not_null{m_ghostName};
+    return gsl_lite::not_null{m_ghostName};
 
-  auto m = gsl::make_shared<Material>(m_shaderCache->getGhostName());
+  auto m = gsl_lite::make_shared<Material>(m_shaderCache->getGhostName());
   auto& renderState = m->getRenderState();
   renderState.setCullFace(false);
   renderState.setBlend(0, true);
@@ -620,24 +629,24 @@ gslu::nn_shared<Material> MaterialManager::getGhostName()
   renderState.setDepthTest(true);
   // TODO this seems wrong, need to verify
   renderState.setDepthWrite(false);
-  m->getUniformBlock("Camera")->bindCameraBuffer(m_renderer->getCamera());
+  m->getUniformBlock("Camera")->bindCameraBuffer(m_camera);
   m->getUniformBlock("Transform")->bindTransformBuffer();
   m_ghostName = m;
   return m;
 }
 
-void MaterialManager::setDeathStrength(float strength)
+void MaterialManager::setDeathStrength(const float strength)
 {
-  auto m = getDeath();
+  const auto m = getDeath();
   m->getUniform("u_strength")->set(strength);
 }
 
 void MaterialManager::createSampler(
   const gslu::nn_shared<gl::Texture2DArray<gl::PremultipliedSRGBA8>>& geometryTextures,
-  bool bilinear,
+  const bool bilinear,
   const std::optional<float>& anisotropyLevel)
 {
-  auto sampler = gsl::make_unique<gl::Sampler>("geometry")
+  auto sampler = gsl_lite::make_unique<gl::Sampler>("geometry")
                  | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
                  | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge);
   if(bilinear)
@@ -655,4 +664,22 @@ void MaterialManager::createSampler(
   m_geometryTexturesHandle = std::make_shared<gl::TextureHandle<gl::Texture2DArray<gl::PremultipliedSRGBA8>>>(
     geometryTextures, std::move(sampler));
 }
+
+void MaterialManager::bindNoiseAndTime(const Material& m) const
+{
+  if(const auto uniform = m.tryGetUniform("u_noise"))
+    uniform->set(gsl_lite::not_null{m_noiseTexture});
+
+  if(const auto uniform = m.tryGetUniform("u_time"); uniform != nullptr)
+  {
+    uniform->bind(
+      [this](const scene::Node*, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+      {
+        const auto now = m_gameTimeProvider();
+        const auto duration
+          = std::chrono::duration_cast<std::chrono::duration<float, std::milli>>(now.time_since_epoch());
+        uniform.set(duration.count());
+      });
+  }
+}
 } // namespace render::material
diff --git a/src/render/material/materialmanager.h b/src/render/material/materialmanager.h
index 1af9bbfa6..37af75f80 100644
--- a/src/render/material/materialmanager.h
+++ b/src/render/material/materialmanager.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <chrono>
 #include <cstdint>
 #include <functional>
 #include <gl/buffer.h>
@@ -14,7 +15,7 @@
 namespace render::scene
 {
 class CSM;
-class Renderer;
+class Camera;
 } // namespace render::scene
 
 namespace render::material
@@ -27,13 +28,16 @@ class MaterialManager final
 {
 public:
   struct alignas(sizeof(uint64_t)) CsmHandleContainer;
-  explicit MaterialManager(gslu::nn_shared<ShaderCache> shaderCache, gslu::nn_shared<scene::Renderer> renderer);
+  explicit MaterialManager(gslu::nn_shared<ShaderCache> shaderCache,
+                           gslu::nn_shared<scene::Camera> camera,
+                           std::function<float()> interTickFactorProvider,
+                           std::function<std::chrono::high_resolution_clock::time_point()> gameTimeProvider);
 
   [[nodiscard]] gslu::nn_shared<Material> getSprite(SpriteMaterialMode mode,
                                                     const std::function<int32_t()>& lightingMode);
 
-  [[nodiscard]] gslu::nn_shared<Material> getCSMDepthOnly(bool skeletal, const std::function<bool()>& smooth);
-  [[nodiscard]] gslu::nn_shared<Material> getDepthOnly(bool skeletal, const std::function<bool()>& smooth);
+  [[nodiscard]] gslu::nn_shared<Material> getCSMDepthOnly(bool skeletal, const std::function<bool()>& smooth) const;
+  [[nodiscard]] gslu::nn_shared<Material> getDepthOnly(bool skeletal, const std::function<bool()>& smooth) const;
 
   [[nodiscard]] gslu::nn_shared<Material> getGeometry(bool inWater,
                                                       bool skeletal,
@@ -89,9 +93,42 @@ class MaterialManager final
 
   void setDeathStrength(float strength);
 
+  class InterTickFactorOverride final
+  {
+  public:
+    InterTickFactorOverride(MaterialManager& mgr)
+        : m_mgr{mgr}
+        , m_original{std::move(mgr.m_interTickFactorProvider)}
+    {
+      m_mgr.m_interTickFactorProvider = []
+      {
+        return 0.0f;
+      };
+    }
+
+    ~InterTickFactorOverride()
+    {
+      m_mgr.m_interTickFactorProvider = std::move(m_original);
+    }
+
+    InterTickFactorOverride(const InterTickFactorOverride&) = delete;
+    InterTickFactorOverride& operator=(const InterTickFactorOverride&) = delete;
+    InterTickFactorOverride(InterTickFactorOverride&&) = delete;
+    InterTickFactorOverride& operator=(InterTickFactorOverride&&) = delete;
+
+  private:
+    MaterialManager& m_mgr;
+    std::function<float()> m_original;
+  };
+
+  [[nodiscard]] InterTickFactorOverride overrideInterTickFactor()
+  {
+    return InterTickFactorOverride{*this};
+  }
+
 private:
   gslu::nn_shared<ShaderCache> m_shaderCache;
-  std::shared_ptr<gl::TextureHandle<gl::Texture2D<gl::RGB8>>> m_noiseTexture;
+  std::shared_ptr<gl::TextureHandle<gl::Texture2D<gl::RGBA8>>> m_noiseTexture;
 
   std::map<uint8_t, gslu::nn_shared<Material>> m_fxaa;
   std::shared_ptr<Material> m_crtV0{nullptr};
@@ -127,12 +164,16 @@ class MaterialManager final
   std::shared_ptr<Material> m_ghostName{nullptr};
 
   std::shared_ptr<scene::CSM> m_csm;
-  gslu::nn_shared<scene::Renderer> m_renderer;
+  gslu::nn_shared<scene::Camera> m_camera;
   std::shared_ptr<gl::TextureHandle<gl::Texture2DArray<gl::PremultipliedSRGBA8>>> m_geometryTexturesHandle;
   std::shared_ptr<gl::UniformBuffer<CsmHandleContainer>> m_csmBuffer;
 
+  std::function<float()> m_interTickFactorProvider;
+  std::function<std::chrono::high_resolution_clock::time_point()> m_gameTimeProvider;
+
   void createSampler(const gslu::nn_shared<gl::Texture2DArray<gl::PremultipliedSRGBA8>>& geometryTextures,
                      bool bilinear,
                      const std::optional<float>& anisotropyLevel);
+  void bindNoiseAndTime(const Material& m) const;
 };
 } // namespace render::material
diff --git a/src/render/material/shadercache.cpp b/src/render/material/shadercache.cpp
index 9713f0622..56f73a56b 100644
--- a/src/render/material/shadercache.cpp
+++ b/src/render/material/shadercache.cpp
@@ -7,7 +7,7 @@
 #include <boost/log/trivial.hpp>
 #include <filesystem>
 #include <gl/shader.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <string>
 #include <vector>
@@ -27,10 +27,11 @@ std::string makeId(const std::filesystem::path& vshPath,
   id += ';';
   id += geomPath.string();
   id += ';';
-  std::sort(defines.begin(), defines.end());
+  std::ranges::sort(defines);
   id += boost::algorithm::join(defines, ";");
   return id;
 }
+
 std::string
   makeId(const std::filesystem::path& vshPath, const std::filesystem::path& fshPath, std::vector<std::string> defines)
 {
@@ -38,15 +39,16 @@ std::string
   id += ';';
   id += fshPath.string();
   id += ';';
-  std::sort(defines.begin(), defines.end());
+  std::ranges::sort(defines);
   id += boost::algorithm::join(defines, ";");
   return id;
 }
+
 std::string makeId(const std::filesystem::path& shaderPath, std::vector<std::string> defines)
 {
   std::string id = shaderPath.string();
   id += ';';
-  std::sort(defines.begin(), defines.end());
+  std::ranges::sort(defines);
   id += boost::algorithm::join(defines, ";");
   return id;
 }
@@ -57,14 +59,13 @@ gslu::nn_shared<ShaderProgram> ShaderCache::get(const std::filesystem::path& vsh
                                                 const std::vector<std::string>& defines)
 {
   const auto programId = makeId(vshPath, fshPath, defines);
-  const auto it = m_programs.find(programId);
-  if(it != m_programs.end())
+  if(const auto it = m_programs.find(programId); it != m_programs.end())
     return it->second;
 
   BOOST_LOG_TRIVIAL(debug) << "Loading shader program " << programId;
   auto vert = gl::VertexShader::create(m_root / vshPath, defines, makeId(vshPath, defines));
   auto frag = gl::FragmentShader::create(m_root / fshPath, defines, makeId(fshPath, defines));
-  auto shader = gsl::make_shared<ShaderProgram>(programId, vert, frag);
+  auto shader = gsl_lite::make_shared<ShaderProgram>(programId, vert, frag);
   m_programs.emplace(programId, shader);
   return shader;
 }
@@ -75,16 +76,15 @@ gslu::nn_shared<ShaderProgram> ShaderCache::get(const std::filesystem::path& vsh
                                                 const std::vector<std::string>& defines)
 {
   const auto programId = makeId(vshPath, fshPath, geomPath, defines);
-  const auto it = m_programs.find(programId);
-  if(it != m_programs.end())
+  if(const auto it = m_programs.find(programId); it != m_programs.end())
     return it->second;
 
   BOOST_LOG_TRIVIAL(debug) << "Loading shader program " << programId;
   auto vert = gl::VertexShader::create(m_root / vshPath, defines, makeId(vshPath, defines));
   auto frag = gl::FragmentShader::create(m_root / fshPath, defines, makeId(fshPath, defines));
   auto geom = gl::GeometryShader::create(m_root / geomPath, defines, makeId(geomPath, defines));
-  auto shader = gsl::make_shared<ShaderProgram>(programId, vert, frag, geom);
+  auto shader = gsl_lite::make_shared<ShaderProgram>(programId, vert, frag, geom);
   m_programs.emplace(programId, shader);
   return shader;
 }
-} // namespace render::material
+} // namespace render::material
\ No newline at end of file
diff --git a/src/render/material/shadercache.h b/src/render/material/shadercache.h
index c0e7a239b..e2a89f746 100644
--- a/src/render/material/shadercache.h
+++ b/src/render/material/shadercache.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <string>
 #include <unordered_map>
@@ -34,7 +34,7 @@ class ShaderCache final
                                                    const std::filesystem::path& geomPath,
                                                    const std::vector<std::string>& defines = {});
 
-  [[nodiscard]] auto getFlat(bool withAlphaMultiplier, bool invertY, bool withAspectRatio)
+  [[nodiscard]] auto getFlat(const bool withAlphaMultiplier, const bool invertY, const bool withAspectRatio)
   {
     std::vector<std::string> defines;
     if(withAlphaMultiplier)
@@ -46,7 +46,7 @@ class ShaderCache final
     return get("flat.vert", "flat.frag", defines);
   }
 
-  [[nodiscard]] auto getBackdrop(bool withAlphaMultiplier)
+  [[nodiscard]] auto getBackdrop(const bool withAlphaMultiplier)
   {
     std::vector<std::string> defines;
     if(withAlphaMultiplier)
@@ -54,7 +54,8 @@ class ShaderCache final
     return get("backdrop.vert", "flat.frag", defines);
   }
 
-  [[nodiscard]] auto getGeometry(bool inWater, bool skeletal, bool roomShadowing, bool opaque, uint8_t spriteMode)
+  [[nodiscard]] auto getGeometry(
+    const bool inWater, const bool skeletal, const bool roomShadowing, const bool opaque, const uint8_t spriteMode)
   {
     std::vector<std::string> defines;
     if(inWater)
@@ -65,11 +66,11 @@ class ShaderCache final
       defines.emplace_back("ROOM_SHADOWING");
     if(opaque)
       defines.emplace_back("EARLY_FRAGMENT_TEST");
-    defines.emplace_back("SPRITEMODE " + std::to_string(int(spriteMode)));
+    defines.emplace_back("SPRITEMODE " + std::to_string(static_cast<int>(spriteMode)));
     return get("geometry.vert", "geometry.frag", defines);
   }
 
-  [[nodiscard]] auto getCSMDepthOnly(bool skeletal)
+  [[nodiscard]] auto getCSMDepthOnly(const bool skeletal)
   {
     std::vector<std::string> defines;
     if(skeletal)
@@ -77,7 +78,7 @@ class ShaderCache final
     return get("csm_depth_only.vert", "empty.frag", defines);
   }
 
-  [[nodiscard]] auto getDepthOnly(bool skeletal)
+  [[nodiscard]] auto getDepthOnly(const bool skeletal)
   {
     std::vector<std::string> defines;
     if(skeletal)
@@ -90,10 +91,10 @@ class ShaderCache final
     return get("water_surface.vert", "water_surface.frag");
   }
 
-  [[nodiscard]] auto getFXAA(uint8_t preset)
+  [[nodiscard]] auto getFXAA(const uint8_t preset)
   {
     return get(
-      "flat.vert", "fx_fxaa.frag", std::vector<std::string>{"FXAA_QUALITY__PRESET " + std::to_string(int(preset))});
+      "flat.vert", "fx_fxaa.frag", std::vector{"FXAA_QUALITY__PRESET " + std::to_string(static_cast<int>(preset))});
   }
 
   [[nodiscard]] auto getCRTV0()
@@ -106,12 +107,12 @@ class ShaderCache final
     return get("flat.vert", "fx_crt_v1.frag");
   }
 
-  [[nodiscard]] auto getBrightnessContrast(int8_t brightness, int8_t contrast)
+  [[nodiscard]] auto getBrightnessContrast(const int8_t brightness, const int8_t contrast)
   {
     return get("flat.vert",
                "fx_brightness_contrast.frag",
-               std::vector<std::string>{"BRIGHTNESS " + std::to_string(int(brightness)),
-                                        "CONTRAST " + std::to_string(int(contrast))});
+               std::vector{"BRIGHTNESS " + std::to_string(static_cast<int>(brightness)),
+                           "CONTRAST " + std::to_string(static_cast<int>(contrast))});
   }
 
   [[nodiscard]] auto getVelvia()
@@ -134,7 +135,7 @@ class ShaderCache final
     return get("flat.vert", "fx_lens_distortion.frag");
   }
 
-  [[nodiscard]] auto getMasking(bool ao, bool edges)
+  [[nodiscard]] auto getMasking(const bool ao, const bool edges)
   {
     std::vector<std::string> defines;
     if(ao)
@@ -174,21 +175,21 @@ class ShaderCache final
     return get("flat.vert", "fx_bloom.frag");
   }
 
-  [[nodiscard]] auto getFastGaussBlur(const uint8_t extent, uint8_t blurDim)
+  [[nodiscard]] auto getFastGaussBlur(const uint8_t extent, const uint8_t blurDim)
   {
     gsl_Expects(extent > 0);
     gsl_Expects(blurDim > 0);
     gsl_Expects(blurDim <= 3);
-    const std::vector<std::string> defines{"BLUR_DIM " + std::to_string(blurDim)};
+    const std::vector defines{"BLUR_DIM " + std::to_string(blurDim)};
     return get("flat.vert", "blur_fast_gauss_" + std::to_string(extent * 2 + 1) + ".frag", defines);
   }
 
-  [[nodiscard]] auto getFastBoxBlur(const uint8_t extent, uint8_t blurDim)
+  [[nodiscard]] auto getFastBoxBlur(const uint8_t extent, const uint8_t blurDim)
   {
     gsl_Expects(extent > 0);
     gsl_Expects(blurDim > 0);
     gsl_Expects(blurDim <= 3);
-    const std::vector<std::string> defines{"BLUR_DIM " + std::to_string(blurDim)};
+    const std::vector defines{"BLUR_DIM " + std::to_string(blurDim)};
     return get("flat.vert", "blur_fast_box_" + std::to_string(extent * 2 + 1) + ".frag", defines);
   }
 
@@ -207,7 +208,7 @@ class ShaderCache final
     return get("flat.vert", "vsm_square.frag");
   }
 
-  [[nodiscard]] auto getWorldComposition(bool inWater, bool dof)
+  [[nodiscard]] auto getWorldComposition(const bool inWater, const bool dof)
   {
     std::vector<std::string> defines;
     if(inWater)
@@ -229,7 +230,7 @@ class ShaderCache final
 
   [[nodiscard]] auto getDustParticle()
   {
-    return get("dust.vert", "dust.frag", "dust.geom");
+    return get("dust.vert", "dust.frag");
   }
 
   [[nodiscard]] auto getGhost()
@@ -244,4 +245,4 @@ class ShaderCache final
     return get("geometry.vert", "ghost_name.frag", defines);
   }
 };
-} // namespace render::material
+} // namespace render::material
\ No newline at end of file
diff --git a/src/render/material/uniformparameter.cpp b/src/render/material/uniformparameter.cpp
index 8cd8508bf..edb7cdba3 100644
--- a/src/render/material/uniformparameter.cpp
+++ b/src/render/material/uniformparameter.cpp
@@ -7,7 +7,7 @@
 
 #include <boost/log/trivial.hpp>
 #include <gl/program.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 
 namespace render::material
@@ -105,4 +105,4 @@ gl::UniformBlock* UniformBlockParameter::findUniformBlock(ShaderProgram& shaderP
 
   return nullptr;
 }
-} // namespace render::material
+} // namespace render::material
\ No newline at end of file
diff --git a/src/render/material/uniformparameter.h b/src/render/material/uniformparameter.h
index e8e2486d1..812341076 100644
--- a/src/render/material/uniformparameter.h
+++ b/src/render/material/uniformparameter.h
@@ -79,7 +79,7 @@ class UniformParameter final : public MaterialParameter
   std::function<UniformValueSetter> m_valueSetter;
 };
 
-class UniformBlockParameter : public MaterialParameter
+class UniformBlockParameter final : public MaterialParameter
 {
 public:
   explicit UniformBlockParameter(std::string name)
diff --git a/src/render/pass/bloompass.h b/src/render/pass/bloompass.h
index 2ed77c335..dc1c6326f 100644
--- a/src/render/pass/bloompass.h
+++ b/src/render/pass/bloompass.h
@@ -32,7 +32,7 @@ class SingleBloomDownsample final
       , m_output{std::make_shared<gl::Texture2D<TPixel>>(input->getTexture()->size() / 2, m_name + "-downsample-color")}
       , m_outputHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<TPixel>>>(
           m_output,
-          gsl::make_unique<gl::Sampler>(m_name + "-downsample-color" + gl::SamplerSuffix)
+          gsl_lite::make_unique<gl::Sampler>(m_name + "-downsample-color" + gl::SamplerSuffix)
             | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
             | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
             | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
@@ -89,19 +89,17 @@ class BloomDownsample final
   {
     for(uint8_t i = 0; i < NSteps; ++i)
     {
-      m_steps[i]
-        = std::make_shared<SingleBloomDownsample<TPixel>>(name + ":" + std::to_string(int(i)), materialManager, input);
+      m_steps[i] = std::make_shared<SingleBloomDownsample<TPixel>>(
+        name + ":" + std::to_string(static_cast<int>(i)), materialManager, input);
       input = m_steps[i]->getOutput();
     }
   }
 
   void render()
   {
-    std::shared_ptr<SingleBloomDownsample<TPixel>> prevStep;
     for(const auto& step : m_steps)
     {
       step->render();
-      prevStep = step;
     }
   }
 
@@ -128,7 +126,7 @@ class SingleBloomUpsample final
       , m_output{std::make_shared<gl::Texture2D<TPixel>>(input->getTexture()->size() * 2, m_name + "-upsample-color")}
       , m_outputHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<TPixel>>>(
           m_output,
-          gsl::make_unique<gl::Sampler>(m_name + "-upsample-color" + gl::SamplerSuffix)
+          gsl_lite::make_unique<gl::Sampler>(m_name + "-upsample-color" + gl::SamplerSuffix)
             | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
             | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
             | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
@@ -185,19 +183,17 @@ class BloomUpsample final
   {
     for(uint8_t i = 0; i < NSteps; ++i)
     {
-      m_steps[i]
-        = std::make_shared<SingleBloomUpsample<TPixel>>(name + ":" + std::to_string(int(i)), materialManager, input);
+      m_steps[i] = std::make_shared<SingleBloomUpsample<TPixel>>(
+        name + ":" + std::to_string(static_cast<int>(i)), materialManager, input);
       input = m_steps[i]->getOutput();
     }
   }
 
   void render()
   {
-    std::shared_ptr<SingleBloomUpsample<TPixel>> prevStep;
     for(const auto& step : m_steps)
     {
       step->render();
-      prevStep = step;
     }
   }
 
@@ -240,4 +236,4 @@ class BloomPass final
   scene::SeparableBlur<TPixel> m_blur;
   BloomUpsample<NSteps, TPixel> m_upsample;
 };
-} // namespace render::pass
+} // namespace render::pass
\ No newline at end of file
diff --git a/src/render/pass/edgedetectionpass.cpp b/src/render/pass/edgedetectionpass.cpp
index fbf4bf99e..8e59c3cc1 100644
--- a/src/render/pass/edgedetectionpass.cpp
+++ b/src/render/pass/edgedetectionpass.cpp
@@ -19,7 +19,7 @@
 #include <gl/texture2d.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -40,7 +40,7 @@ EdgeDetectionPass::EdgeDetectionPass(material::MaterialManager& materialManager,
     , m_edgeBuffer{std::make_shared<gl::Texture2D<gl::ScalarByte>>(viewport, "edge")}
     , m_edgeBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::ScalarByte>>>(
         m_edgeBuffer,
-        gsl::make_unique<gl::Sampler>("edge" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("edge" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Nearest) | set(gl::api::TextureMagFilter::Nearest))}
@@ -52,7 +52,7 @@ EdgeDetectionPass::EdgeDetectionPass(material::MaterialManager& materialManager,
     , m_dilationBuffer{std::make_shared<gl::Texture2D<gl::ScalarByte>>(viewport, "dilation")}
     , m_dilationBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::ScalarByte>>>(
         m_dilationBuffer,
-        gsl::make_unique<gl::Sampler>("dilation" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("dilation" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Nearest) | set(gl::api::TextureMagFilter::Nearest))}
@@ -61,32 +61,29 @@ EdgeDetectionPass::EdgeDetectionPass(material::MaterialManager& materialManager,
                      .build("dilation-fb")}
 {
   m_edgeRenderMesh->bind("u_normals",
-                         [buffer = geometryPass->getNormalBuffer()](const render::scene::Node* /*node*/,
-                                                                    const render::scene::Mesh& /*mesh*/,
-                                                                    gl::Uniform& uniform)
+                         [buffer = geometryPass->getNormalBuffer()](
+                           const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                          {
                            uniform.set(buffer);
                          });
   m_edgeRenderMesh->bind("u_depth",
-                         [buffer = geometryPass->getDepthBufferHandle()](const render::scene::Node* /*node*/,
-                                                                         const render::scene::Mesh& /*mesh*/,
-                                                                         gl::Uniform& uniform)
+                         [buffer = geometryPass->getDepthBufferHandle()](
+                           const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                          {
                            uniform.set(buffer);
                          });
   m_edgeRenderMesh->getRenderState().merge(m_edgeFb->getRenderState());
 
-  m_dilationRenderMesh->bind("u_edges",
-                             [buffer = m_edgeBufferHandle](const render::scene::Node* /*node*/,
-                                                           const render::scene::Mesh& /*mesh*/,
-                                                           gl::Uniform& uniform)
-                             {
-                               uniform.set(buffer);
-                             });
+  m_dilationRenderMesh->bind(
+    "u_edges",
+    [buffer = m_edgeBufferHandle](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+    {
+      uniform.set(buffer);
+    });
   m_dilationRenderMesh->getRenderState().merge(m_dilationFb->getRenderState());
 }
 
-void EdgeDetectionPass::render()
+void EdgeDetectionPass::render() const
 {
   SOGLB_DEBUGGROUP("edge-pass");
 
@@ -109,4 +106,4 @@ void EdgeDetectionPass::render()
   if constexpr(FlushPasses)
     GL_ASSERT(gl::api::finish());
 }
-} // namespace render::pass
+} // namespace render::pass
\ No newline at end of file
diff --git a/src/render/pass/edgedetectionpass.h b/src/render/pass/edgedetectionpass.h
index c748f9da8..37655cee8 100644
--- a/src/render/pass/edgedetectionpass.h
+++ b/src/render/pass/edgedetectionpass.h
@@ -26,7 +26,7 @@ class EdgeDetectionPass
                              const glm::ivec2& viewport,
                              const gslu::nn_shared<GeometryPass>& geometryPass);
 
-  void render();
+  void render() const;
 
   [[nodiscard]] const auto& getTexture() const
   {
diff --git a/src/render/pass/effectpass.h b/src/render/pass/effectpass.h
index 43d873f41..8edb919e7 100644
--- a/src/render/pass/effectpass.h
+++ b/src/render/pass/effectpass.h
@@ -10,7 +10,7 @@
 #include <gl/glassert.h>
 #include <gl/sampler.h>
 #include <gl/soglb_fwd.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <string>
 
@@ -30,7 +30,7 @@ template<typename TPixel>
 class EffectPass final
 {
 public:
-  explicit EffectPass(gsl::not_null<const RenderPipeline*> renderPipeline,
+  explicit EffectPass(gsl_lite::not_null<const RenderPipeline*> renderPipeline,
                       std::string name,
                       const gslu::nn_shared<material::Material>& material,
                       const gslu::nn_shared<gl::TextureHandle<gl::Texture2D<TPixel>>>& input)
@@ -39,7 +39,7 @@ class EffectPass final
       , m_output{std::make_shared<gl::Texture2D<TPixel>>(input->getTexture()->size(), m_name + "-color")}
       , m_outputHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<TPixel>>>(
           m_output,
-          gsl::make_unique<gl::Sampler>(m_name + "-color" + gl::SamplerSuffix)
+          gsl_lite::make_unique<gl::Sampler>(m_name + "-color" + gl::SamplerSuffix)
             | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
             | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
             | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
@@ -57,7 +57,7 @@ class EffectPass final
                   = std::move(renderPipeline)](const scene::Node*, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                  {
                    const auto now = renderPipeline->getLocalTime();
-                   uniform.set(gsl::narrow_cast<float>(now.count()));
+                   uniform.set(gsl_lite::narrow_cast<float>(now.count()));
                  });
 
     m_mesh->getRenderState().merge(m_fb->getRenderState());
@@ -105,4 +105,4 @@ class EffectPass final
   gslu::nn_shared<gl::TextureHandle<gl::Texture2D<TPixel>>> m_outputHandle;
   gslu::nn_shared<gl::Framebuffer> m_fb;
 };
-} // namespace render::pass
+} // namespace render::pass
\ No newline at end of file
diff --git a/src/render/pass/framebuffer.cpp b/src/render/pass/framebuffer.cpp
index 12b6e1035..e58f04f17 100644
--- a/src/render/pass/framebuffer.cpp
+++ b/src/render/pass/framebuffer.cpp
@@ -16,7 +16,7 @@
 #include <gl/texturedepth.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -32,7 +32,7 @@ namespace render::pass
 {
 Framebuffer::Framebuffer(const std::string& name,
                          gslu::nn_shared<material::Material> material,
-                         scene::Translucency translucencySelector,
+                         const scene::Translucency translucencySelector,
                          const glm::ivec2& size)
     : m_material{std::move(material)}
     , m_mesh{scene::createScreenQuad(m_material, translucencySelector, name)}
@@ -40,7 +40,7 @@ Framebuffer::Framebuffer(const std::string& name,
     , m_colorBuffer{std::make_shared<gl::Texture2D<gl::SRGBA8>>(size, name + "-color")}
     , m_colorBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::SRGBA8>>>(
         m_colorBuffer,
-        gsl::make_unique<gl::Sampler>(name + "-color" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>(name + "-color" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
@@ -51,7 +51,7 @@ Framebuffer::Framebuffer(const std::string& name,
     , m_translucencySelector{translucencySelector}
 {
   m_mesh->bind("u_input",
-               [this](const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+               [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                {
                  uniform.set(m_colorBufferHandle);
                });
@@ -59,7 +59,7 @@ Framebuffer::Framebuffer(const std::string& name,
   m_mesh->getRenderState().setBlendFactors(0, gl::api::BlendingFactor::One, gl::api::BlendingFactor::OneMinusSrcAlpha);
 }
 
-void Framebuffer::render()
+void Framebuffer::render() const
 {
   scene::RenderContext context{m_translucencySelector == scene::Translucency::Opaque
                                  ? material::RenderMode::FullOpaque
@@ -69,7 +69,7 @@ void Framebuffer::render()
   m_mesh->render(nullptr, context);
 }
 
-void Framebuffer::render(const std::function<void()>& doRender)
+void Framebuffer::render(const std::function<void()>& doRender) const
 {
   m_fb->bind();
   gl::RenderState::getWantedState().merge(m_fb->getRenderState());
@@ -77,4 +77,4 @@ void Framebuffer::render(const std::function<void()>& doRender)
   doRender();
   m_fb->unbind();
 }
-} // namespace render::pass
+} // namespace render::pass
\ No newline at end of file
diff --git a/src/render/pass/framebuffer.h b/src/render/pass/framebuffer.h
index e25736395..a0871e894 100644
--- a/src/render/pass/framebuffer.h
+++ b/src/render/pass/framebuffer.h
@@ -34,7 +34,7 @@ class Framebuffer final
                        scene::Translucency translucencySelector,
                        const glm::ivec2& size);
 
-  void render(const std::function<void()>& doRender);
+  void render(const std::function<void()>& doRender) const;
 
   [[nodiscard]] const auto& getOutput() const
   {
@@ -46,7 +46,7 @@ class Framebuffer final
     return m_depthBuffer;
   }
 
-  void render();
+  void render() const;
 
 private:
   gslu::nn_shared<material::Material> m_material;
diff --git a/src/render/pass/geometrypass.cpp b/src/render/pass/geometrypass.cpp
index 2a1f2026d..d6abb9e60 100644
--- a/src/render/pass/geometrypass.cpp
+++ b/src/render/pass/geometrypass.cpp
@@ -10,7 +10,7 @@
 #include <gl/texturedepth.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace render::pass
@@ -19,35 +19,35 @@ GeometryPass::GeometryPass(const glm::ivec2& viewport)
     : m_depthBuffer{std::make_shared<gl::TextureDepth<float>>(viewport, "geometry-depth")}
     , m_depthBufferHandle{std::make_shared<gl::TextureHandle<gl::TextureDepth<float>>>(
         m_depthBuffer,
-        gsl::make_unique<gl::Sampler>("depth" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("depth" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
     , m_colorBuffer{std::make_shared<gl::Texture2D<gl::SRGBA8>>(viewport, "geometry-color")}
     , m_colorBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::SRGBA8>>>(
         m_colorBuffer,
-        gsl::make_unique<gl::Sampler>("geometry-color" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("geometry-color" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
     , m_reflectiveBuffer{std::make_shared<gl::Texture2D<gl::SRGBA8>>(viewport, "geometry-reflective")}
     , m_reflectiveBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::SRGBA8>>>(
         m_reflectiveBuffer,
-        gsl::make_unique<gl::Sampler>("geometry-reflective" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("geometry-reflective" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
     , m_positionBuffer{std::make_shared<gl::Texture2D<gl::RGB32F>>(viewport, "geometry-position")}
     , m_positionBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::RGB32F>>>(
         m_positionBuffer,
-        gsl::make_unique<gl::Sampler>("geometry-position" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("geometry-position" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Nearest) | set(gl::api::TextureMagFilter::Nearest))}
     , m_normalBuffer{std::make_shared<gl::Texture2D<gl::RGB16F>>(viewport, "geometry-normal")}
     , m_normalBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::RGB16F>>>(
         m_normalBuffer,
-        gsl::make_unique<gl::Sampler>("geometry-normal" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("geometry-normal" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Nearest) | set(gl::api::TextureMagFilter::Nearest))}
@@ -73,4 +73,4 @@ void GeometryPass::render(const std::function<void()>& doRender)
   doRender();
   //m_fb->unbind();
 }
-} // namespace render::pass
+} // namespace render::pass
\ No newline at end of file
diff --git a/src/render/pass/hbaopass.cpp b/src/render/pass/hbaopass.cpp
index 9f9a34147..0e7fa069b 100644
--- a/src/render/pass/hbaopass.cpp
+++ b/src/render/pass/hbaopass.cpp
@@ -21,7 +21,7 @@
 #include <gl/texture2d.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -43,7 +43,7 @@ HBAOPass::HBAOPass(material::MaterialManager& materialManager,
     , m_aoBuffer{std::make_shared<gl::Texture2D<gl::ScalarByte>>(viewport, "hbao-ao")}
     , m_aoBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::ScalarByte>>>(
         m_aoBuffer,
-        gsl::make_unique<gl::Sampler>("hbao-ao" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("hbao-ao" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
@@ -54,19 +54,19 @@ HBAOPass::HBAOPass(material::MaterialManager& materialManager,
 {
   m_renderMesh->bind("u_normals",
                      [buffer = m_geometryPass->getNormalBuffer()](
-                       const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+                       const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                      {
                        uniform.set(buffer);
                      });
   m_renderMesh->bind("u_position",
                      [buffer = m_geometryPass->getPositionBuffer()](
-                       const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+                       const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                      {
                        uniform.set(buffer);
                      });
   m_renderMesh->getRenderState().merge(m_fb->getRenderState());
 
-  m_blur.setInput(gsl::not_null{m_aoBufferHandle});
+  m_blur.setInput(gsl_lite::not_null{m_aoBufferHandle});
 }
 
 void HBAOPass::updateCamera(const gslu::nn_shared<scene::Camera>& camera)
@@ -88,4 +88,4 @@ void HBAOPass::render()
   if constexpr(FlushPasses)
     GL_ASSERT(gl::api::finish());
 }
-} // namespace render::pass
+} // namespace render::pass
\ No newline at end of file
diff --git a/src/render/pass/portalpass.cpp b/src/render/pass/portalpass.cpp
index 04d631a2d..b5c9fcd2f 100644
--- a/src/render/pass/portalpass.cpp
+++ b/src/render/pass/portalpass.cpp
@@ -13,7 +13,7 @@
 #include <gl/texture2d.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <limits>
 #include <memory>
@@ -33,15 +33,15 @@ PortalPass::PortalPass(material::MaterialManager& materialManager,
     , m_positionBuffer{std::make_shared<gl::Texture2D<gl::Scalar32F>>(viewport, "portal-position")}
     , m_positionBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::Scalar32F>>>(
         m_positionBuffer,
-        gsl::make_unique<gl::Sampler>("portal-position" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("portal-position" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Nearest) | set(gl::api::TextureMagFilter::Nearest))}
     , m_perturbBuffer{std::make_shared<gl::Texture2D<gl::RGB32F>>(viewport, "portal-perturb")}
     , m_perturbBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::RGB32F>>>(
         m_perturbBuffer,
-        gsl::make_unique<gl::Sampler>("portal-perturb" + gl::SamplerSuffix) | set(gl::api::TextureMinFilter::Linear)
-          | set(gl::api::TextureMagFilter::Linear))}
+        gsl_lite::make_unique<gl::Sampler>("portal-perturb" + gl::SamplerSuffix)
+          | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
     , m_blur{"perturb", materialManager, 4, true}
     , m_fb{gl::FrameBufferBuilder()
              .textureNoBlend(gl::api::FramebufferAttachment::ColorAttachment0, m_perturbBuffer)
@@ -49,7 +49,7 @@ PortalPass::PortalPass(material::MaterialManager& materialManager,
              .textureNoBlend(gl::api::FramebufferAttachment::DepthAttachment, m_geometryPass->getDepthBuffer())
              .build("portal-fb")}
 {
-  m_blur.setInput(gsl::not_null{m_perturbBufferHandle});
+  m_blur.setInput(gsl_lite::not_null{m_perturbBufferHandle});
 }
 
 // NOLINTNEXTLINE(readability-make-member-function-const)
@@ -62,4 +62,4 @@ void PortalPass::render(const std::function<void(const gl::RenderState&)>& doRen
   doRender(m_fb->getRenderState());
   m_fb->unbind();
 }
-} // namespace render::pass
+} // namespace render::pass
\ No newline at end of file
diff --git a/src/render/pass/uipass.cpp b/src/render/pass/uipass.cpp
index c70895db5..5ba9356e7 100644
--- a/src/render/pass/uipass.cpp
+++ b/src/render/pass/uipass.cpp
@@ -19,7 +19,7 @@
 #include <gl/texture2d.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -41,7 +41,7 @@ UIPass::UIPass(material::MaterialManager& materialManager,
     , m_colorBuffer{std::make_shared<gl::Texture2D<gl::SRGBA8>>(renderViewport, "ui-color")}
     , m_colorBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::SRGBA8>>>(
         m_colorBuffer,
-        gsl::make_unique<gl::Sampler>("ui-color" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("ui-color" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Nearest) | set(gl::api::TextureMagFilter::Nearest))}
@@ -50,9 +50,9 @@ UIPass::UIPass(material::MaterialManager& materialManager,
              .build("ui-fb")}
 {
   m_mesh->bind("u_input",
-               [this](const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+               [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                {
-                 uniform.set(gsl::not_null{m_colorBufferHandle});
+                 uniform.set(gsl_lite::not_null{m_colorBufferHandle});
                });
 
   m_mesh->getRenderState().merge(m_fb->getRenderState());
@@ -60,7 +60,7 @@ UIPass::UIPass(material::MaterialManager& materialManager,
 }
 
 // NOLINTNEXTLINE(readability-make-member-function-const)
-void UIPass::render(const std::function<void()>& doRender)
+void UIPass::renderToFramebuffer(const std::function<void()>& doRender)
 {
   SOGLB_DEBUGGROUP("ui-pass");
   m_colorBuffer->clear({0, 0, 0, 0});
@@ -73,7 +73,7 @@ void UIPass::render(const std::function<void()>& doRender)
 void UIPass::render(float alpha)
 {
   m_mesh->bind("u_alphaMultiplier",
-               [alpha](const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+               [alpha](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                {
                  uniform.set(alpha);
                });
@@ -83,4 +83,4 @@ void UIPass::render(float alpha)
   if constexpr(FlushPasses)
     GL_ASSERT(gl::api::finish());
 }
-} // namespace render::pass
+} // namespace render::pass
\ No newline at end of file
diff --git a/src/render/pass/uipass.h b/src/render/pass/uipass.h
index 25d48a072..64e7b08af 100644
--- a/src/render/pass/uipass.h
+++ b/src/render/pass/uipass.h
@@ -26,7 +26,7 @@ class UIPass
                   const glm::ivec2& renderViewport,
                   const glm::ivec2& displayViewport);
 
-  void render(const std::function<void()>& doRender);
+  void renderToFramebuffer(const std::function<void()>& doRender);
 
   [[nodiscard]] const auto& getColorBuffer() const
   {
diff --git a/src/render/pass/worldcompositionpass.cpp b/src/render/pass/worldcompositionpass.cpp
index fc9e04be9..8e3ed6693 100644
--- a/src/render/pass/worldcompositionpass.cpp
+++ b/src/render/pass/worldcompositionpass.cpp
@@ -24,7 +24,7 @@
 #include <gl/texture2d.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -52,14 +52,14 @@ WorldCompositionPass::WorldCompositionPass(material::MaterialManager& materialMa
     , m_colorBuffer{std::make_shared<gl::Texture2D<gl::SRGB8>>(viewport, "composition-color")}
     , m_colorBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::SRGB8>>>(
         m_colorBuffer,
-        gsl::make_unique<gl::Sampler>("composition-color" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("composition-color" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::Repeat)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::Repeat)
           | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
     , m_bloomedBuffer{std::make_shared<gl::Texture2D<gl::SRGB8>>(viewport, "composition-bloomed")}
     , m_bloomedBufferHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::SRGB8>>>(
         m_bloomedBuffer,
-        gsl::make_unique<gl::Sampler>("composition-bloomed" + gl::SamplerSuffix)
+        gsl_lite::make_unique<gl::Sampler>("composition-bloomed" + gl::SamplerSuffix)
           | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
           | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear))}
@@ -75,35 +75,35 @@ WorldCompositionPass::WorldCompositionPass(material::MaterialManager& materialMa
 {
   m_noWaterMesh->bind("u_portalPosition",
                       [buffer = portalPass->getPositionBuffer()](
-                        const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+                        const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                       {
                         uniform.set(buffer);
                       });
   if(renderSettings.waterDenoise)
     m_noWaterMesh->bind("u_portalPerturb",
-                        [texture = portalPass->getBlurredTexture()](const render::scene::Node* /*node*/,
-                                                                    const render::scene::Mesh& /*mesh*/,
+                        [texture = portalPass->getBlurredTexture()](const scene::Node* /*node*/,
+                                                                    const scene::Mesh& /*mesh*/,
                                                                     gl::Uniform& uniform)
                         {
                           uniform.set(texture);
                         });
   else
     m_noWaterMesh->bind("u_portalPerturb",
-                        [texture = portalPass->getNoisyTexture()](const render::scene::Node* /*node*/,
-                                                                  const render::scene::Mesh& /*mesh*/,
+                        [texture = portalPass->getNoisyTexture()](const scene::Node* /*node*/,
+                                                                  const scene::Mesh& /*mesh*/,
                                                                   gl::Uniform& uniform)
                         {
                           uniform.set(texture);
                         });
   m_noWaterMesh->bind("u_geometryPosition",
                       [buffer = geometryPass->getPositionBuffer()](
-                        const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+                        const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                       {
                         uniform.set(buffer);
                       });
   m_noWaterMesh->bind("u_texture",
                       [buffer = geometryPass->getColorBuffer()](
-                        const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+                        const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                       {
                         uniform.set(buffer);
                       });
@@ -112,36 +112,36 @@ WorldCompositionPass::WorldCompositionPass(material::MaterialManager& materialMa
 
   m_inWaterMesh->bind("u_portalPosition",
                       [buffer = portalPass->getPositionBuffer()](
-                        const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+                        const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                       {
                         uniform.set(buffer);
                       });
 
   if(renderSettings.waterDenoise)
     m_inWaterMesh->bind("u_portalPerturb",
-                        [texture = portalPass->getBlurredTexture()](const render::scene::Node* /*node*/,
-                                                                    const render::scene::Mesh& /*mesh*/,
+                        [texture = portalPass->getBlurredTexture()](const scene::Node* /*node*/,
+                                                                    const scene::Mesh& /*mesh*/,
                                                                     gl::Uniform& uniform)
                         {
                           uniform.set(texture);
                         });
   else
     m_inWaterMesh->bind("u_portalPerturb",
-                        [texture = portalPass->getNoisyTexture()](const render::scene::Node* /*node*/,
-                                                                  const render::scene::Mesh& /*mesh*/,
+                        [texture = portalPass->getNoisyTexture()](const scene::Node* /*node*/,
+                                                                  const scene::Mesh& /*mesh*/,
                                                                   gl::Uniform& uniform)
                         {
                           uniform.set(texture);
                         });
   m_inWaterMesh->bind("u_geometryPosition",
                       [buffer = geometryPass->getPositionBuffer()](
-                        const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+                        const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                       {
                         uniform.set(buffer);
                       });
   m_inWaterMesh->bind("u_texture",
                       [buffer = geometryPass->getColorBuffer()](
-                        const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+                        const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
                       {
                         uniform.set(buffer);
                       });
@@ -150,13 +150,13 @@ WorldCompositionPass::WorldCompositionPass(material::MaterialManager& materialMa
 
   m_bloomMesh->bind(
     "u_input",
-    [this](const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+    [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
     {
       uniform.set(m_colorBufferHandle);
     });
   m_bloomMesh->bind(
     "u_bloom",
-    [this](const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+    [this](const scene::Node* /*node*/, const scene::Mesh& /*mesh*/, gl::Uniform& uniform)
     {
       uniform.set(m_bloomPass->getOutput());
     });
@@ -171,7 +171,7 @@ void WorldCompositionPass::updateCamera(const gslu::nn_shared<scene::Camera>& ca
 }
 
 // NOLINTNEXTLINE(readability-make-member-function-const)
-void WorldCompositionPass::render(bool inWater)
+void WorldCompositionPass::render(const bool inWater)
 {
   SOGLB_DEBUGGROUP("world-composition-pass");
 
@@ -196,4 +196,4 @@ void WorldCompositionPass::render(bool inWater)
   if constexpr(FlushPasses)
     GL_ASSERT(gl::api::finish());
 }
-} // namespace render::pass
+} // namespace render::pass
\ No newline at end of file
diff --git a/src/render/portaltracer.cpp b/src/render/portaltracer.cpp
index 2ba586271..660f7e0ee 100644
--- a/src/render/portaltracer.cpp
+++ b/src/render/portaltracer.cpp
@@ -9,24 +9,23 @@
 #include <algorithm>
 #include <array>
 #include <boost/assert.hpp>
-#include <boost/range/adaptor/argument_fwd.hpp>
-#include <boost/range/adaptor/transformed.hpp>
 #include <cmath>
 #include <cstddef>
 #include <glm/fwd.hpp>
 #include <glm/geometric.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <limits>
 #include <memory>
 #include <optional>
+#include <ranges>
 #include <unordered_set>
 #include <vector>
 
 namespace render
 {
-std::optional<PortalTracer::CullBox> PortalTracer::narrowCullBox(const PortalTracer::CullBox& parentCullBox,
+std::optional<PortalTracer::CullBox> PortalTracer::narrowCullBox(const CullBox& parentCullBox,
                                                                  const engine::world::Portal& portal,
                                                                  const engine::CameraController& camera)
 {
@@ -67,7 +66,7 @@ std::optional<PortalTracer::CullBox> PortalTracer::narrowCullBox(const PortalTra
   // 2. intersect it with the parent's bbox
   CullBox portalCullBox{{1, -1}, {1, -1}};
   size_t behindCamera = 0, tooFar = 0;
-  for(const auto& camSpace : portal.vertices | boost::adaptors::transformed(toView))
+  for(const auto& camSpace : portal.vertices | std::views::transform(toView))
   {
     if(-camSpace.z < 0)
     {
@@ -102,7 +101,7 @@ std::optional<PortalTracer::CullBox> PortalTracer::narrowCullBox(const PortalTra
   if(behindCamera > 0)
   {
     glm::vec3 prev = toView(portal.vertices.back());
-    for(const auto& current : portal.vertices | boost::adaptors::transformed(toView))
+    for(const auto& current : portal.vertices | std::views::transform(toView))
     {
       const auto crossing
         = (-prev.z <= camera.getCamera()->getNearPlane()) != (-current.z <= camera.getCamera()->getNearPlane());
@@ -159,13 +158,13 @@ std::optional<PortalTracer::CullBox> PortalTracer::narrowCullBox(const PortalTra
 
 // NOLINTNEXTLINE(misc-no-recursion)
 bool PortalTracer::traceRoom(const engine::world::Room& room,
-                             const PortalTracer::CullBox& roomCullBox,
+                             const CullBox& roomCullBox,
                              const engine::world::World& world,
                              std::vector<const engine::world::Room*>& seenRooms,
                              const bool inWater,
                              std::unordered_set<const engine::world::Portal*>& waterSurfacePortals,
                              const bool startFromWater,
-                             int depth)
+                             const int depth)
 {
   if(std::find(seenRooms.rbegin(), seenRooms.rend(), &room) != seenRooms.rend())
     return false;
@@ -215,4 +214,4 @@ std::unordered_set<const engine::world::Portal*> PortalTracer::trace(const engin
   gsl_Assert(seenRooms.empty());
   return waterSurfacePortals;
 }
-} // namespace render
+} // namespace render
\ No newline at end of file
diff --git a/src/render/renderpipeline.cpp b/src/render/renderpipeline.cpp
index 7ec37703d..46aaf31be 100644
--- a/src/render/renderpipeline.cpp
+++ b/src/render/renderpipeline.cpp
@@ -34,7 +34,7 @@
 #include <gl/texturedepth.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <optional>
@@ -62,7 +62,7 @@ RenderPipeline::RenderPipeline(material::MaterialManager& materialManager,
   resize(materialManager, renderViewport, uiViewport, displayViewport, true);
 }
 
-void RenderPipeline::worldCompositionPass(const std::vector<engine::world::Room>& rooms, const bool inWater)
+void RenderPipeline::worldCompositionPassToBackbuffer(const std::vector<engine::world::Room>& rooms, const bool inWater)
 {
   BOOST_ASSERT(m_portalPass != nullptr);
   if(m_renderSettings.waterDenoise)
@@ -86,9 +86,11 @@ void RenderPipeline::worldCompositionPass(const std::vector<engine::world::Room>
   {
     SOGLB_DEBUGGROUP("dust");
 
-    m_worldCompositionPass->getFramebuffer()->bind();
-    render::scene::RenderContext context{
-      render::material::RenderMode::FullNonOpaque, std::nullopt, scene::Translucency::NonOpaque};
+    const auto& fb = m_worldCompositionPass->getFramebuffer();
+    fb->bind();
+    scene::RenderContext context{material::RenderMode::FullNonOpaque, std::nullopt, scene::Translucency::NonOpaque};
+    context.pushState(fb->getRenderState());
+
     for(const auto& room : rooms)
     {
       if(!room.node->isVisible() || room.dust == nullptr)
@@ -101,7 +103,7 @@ void RenderPipeline::worldCompositionPass(const std::vector<engine::world::Room>
       state.setScissorRegion({x.min, y.min}, {x.size(), y.size()});
       context.pushState(state);
 
-      render::scene::Visitor visitor{gsl::not_null{&context}};
+      scene::Visitor visitor{gsl_lite::not_null{&context}};
       room.dust->accept(visitor);
       visitor.render(std::nullopt);
 
@@ -123,7 +125,7 @@ void RenderPipeline::worldCompositionPass(const std::vector<engine::world::Room>
   finalOutput->blit(*m_backbuffer);
 }
 
-void RenderPipeline::updateCamera(const gslu::nn_shared<scene::Camera>& camera)
+void RenderPipeline::updateCameraData(const gslu::nn_shared<scene::Camera>& camera)
 {
   BOOST_ASSERT(m_worldCompositionPass != nullptr);
   m_worldCompositionPass->updateCamera(camera);
@@ -142,7 +144,7 @@ void RenderPipeline::resize(material::MaterialManager& materialManager,
                             const glm::ivec2& renderViewport,
                             const glm::ivec2& uiViewport,
                             const glm::ivec2& displayViewport,
-                            bool force)
+                            const bool force)
 {
   if(!force && m_renderSize == renderViewport && m_uiSize == uiViewport && m_displaySize == displayViewport)
   {
@@ -154,16 +156,20 @@ void RenderPipeline::resize(material::MaterialManager& materialManager,
   m_displaySize = displayViewport;
 
   m_geometryPass = std::make_shared<pass::GeometryPass>(m_renderSize);
-  m_portalPass = std::make_shared<pass::PortalPass>(materialManager, gsl::not_null{m_geometryPass}, m_renderSize);
-  m_hbaoPass = std::make_shared<pass::HBAOPass>(materialManager, m_renderSize / 4, gsl::not_null{m_geometryPass});
-  m_edgePass = std::make_shared<pass::EdgeDetectionPass>(materialManager, m_renderSize, gsl::not_null{m_geometryPass});
-  m_worldCompositionPass = std::make_shared<pass::WorldCompositionPass>(
-    materialManager, m_renderSettings, m_renderSize, gsl::not_null{m_geometryPass}, gsl::not_null{m_portalPass});
+  m_portalPass = std::make_shared<pass::PortalPass>(materialManager, gsl_lite::not_null{m_geometryPass}, m_renderSize);
+  m_hbaoPass = std::make_shared<pass::HBAOPass>(materialManager, m_renderSize / 4, gsl_lite::not_null{m_geometryPass});
+  m_edgePass
+    = std::make_shared<pass::EdgeDetectionPass>(materialManager, m_renderSize, gsl_lite::not_null{m_geometryPass});
+  m_worldCompositionPass = std::make_shared<pass::WorldCompositionPass>(materialManager,
+                                                                        m_renderSettings,
+                                                                        m_renderSize,
+                                                                        gsl_lite::not_null{m_geometryPass},
+                                                                        gsl_lite::not_null{m_portalPass});
   m_uiPass = std::make_shared<pass::UIPass>(materialManager, m_uiSize, m_displaySize);
 
   m_backbufferTextureHandle = std::make_shared<gl::TextureHandle<gl::Texture2D<gl::SRGB8>>>(
-    gsl::make_shared<gl::Texture2D<gl::SRGB8>>(m_displaySize, "backbuffer-texture"),
-    gsl::make_unique<gl::Sampler>("backbuffer" + gl::SamplerSuffix));
+    gsl_lite::make_shared<gl::Texture2D<gl::SRGB8>>(m_displaySize, "backbuffer-texture"),
+    gsl_lite::make_unique<gl::Sampler>("backbuffer" + gl::SamplerSuffix));
   m_backbuffer = gl::FrameBufferBuilder{}
                    .texture(gl::api::FramebufferAttachment::ColorAttachment0, m_backbufferTextureHandle->getTexture())
                    .build("backbuffer");
@@ -179,7 +185,7 @@ void RenderPipeline::initWorldEffects(material::MaterialManager& materialManager
   auto fxSource = m_worldCompositionPass->getColorBuffer();
   auto addEffect = [this, &fxSource](const std::string& name, const gslu::nn_shared<material::Material>& material)
   {
-    auto fx = std::make_shared<pass::EffectPass<gl::SRGB8>>(gsl::not_null{this}, "fx:" + name, material, fxSource);
+    auto fx = std::make_shared<pass::EffectPass<gl::SRGB8>>(gsl_lite::not_null{this}, "fx:" + name, material, fxSource);
     m_effects.emplace_back(fx);
     fxSource = fx->getOutput();
     return fx;
@@ -187,7 +193,7 @@ void RenderPipeline::initWorldEffects(material::MaterialManager& materialManager
 
   if(m_renderSettings.hbao || m_renderSettings.edges)
   {
-    auto fx = addEffect("masking", materialManager.getMasking(m_renderSettings.hbao, m_renderSettings.edges));
+    const auto fx = addEffect("masking", materialManager.getMasking(m_renderSettings.hbao, m_renderSettings.edges));
     if(m_renderSettings.hbao)
     {
       BOOST_ASSERT(m_hbaoPass != nullptr);
@@ -216,7 +222,7 @@ void RenderPipeline::initWorldEffects(material::MaterialManager& materialManager
   addEffect("underwater-movement", materialManager.getUnderwaterMovement());
 
   {
-    auto fx = addEffect("reflective", materialManager.getReflective());
+    const auto fx = addEffect("reflective", materialManager.getReflective());
     BOOST_ASSERT(m_geometryPass != nullptr);
     fx->bind("u_normal",
              [texture = m_geometryPass->getNormalBuffer()](
@@ -249,14 +255,16 @@ void RenderPipeline::initWorldEffects(material::MaterialManager& materialManager
     addEffect("filmGrain", materialManager.getFilmGrain());
   }
 }
+
 void RenderPipeline::initBackbufferEffects(material::MaterialManager& materialManager)
 {
   m_backbufferEffects.clear();
 
-  auto fxSource = gsl::not_null{m_backbufferTextureHandle};
+  auto fxSource = gsl_lite::not_null{m_backbufferTextureHandle};
   auto addEffect = [this, &fxSource](const std::string& name, const gslu::nn_shared<material::Material>& material)
   {
-    auto fx = std::make_shared<pass::EffectPass<gl::SRGB8>>(gsl::not_null{this}, "postfx:" + name, material, fxSource);
+    auto fx
+      = std::make_shared<pass::EffectPass<gl::SRGB8>>(gsl_lite::not_null{this}, "postfx:" + name, material, fxSource);
     m_backbufferEffects.emplace_back(fx);
     fxSource = fx->getOutput();
     return fx;
@@ -282,8 +290,8 @@ void RenderPipeline::initBackbufferEffects(material::MaterialManager& materialMa
   {
     addEffect("brightness-contrast",
               materialManager.getBrightnessContrast(
-                m_renderSettings.brightnessEnabled ? m_renderSettings.brightness : int8_t(0),
-                m_renderSettings.contrastEnabled ? m_renderSettings.contrast : int8_t(0)));
+                m_renderSettings.brightnessEnabled ? m_renderSettings.brightness : static_cast<int8_t>(0),
+                m_renderSettings.contrastEnabled ? m_renderSettings.contrast : static_cast<int8_t>(0)));
   }
 }
 
@@ -292,17 +300,17 @@ void RenderPipeline::renderPortalFrameBuffer(const std::function<void(const gl::
   BOOST_ASSERT(m_portalPass != nullptr);
   m_portalPass->render(doRender);
 
-  if constexpr(render::pass::FlushPasses)
+  if constexpr(pass::FlushPasses)
     GL_ASSERT(gl::api::finish());
 }
 
-void RenderPipeline::renderUiFrameBuffer(const std::function<void()>& doRender)
+void RenderPipeline::renderUiIntoFramebuffer(const std::function<void()>& doRender)
 {
   BOOST_ASSERT(m_uiPass != nullptr);
-  m_uiPass->render(doRender);
+  m_uiPass->renderToFramebuffer(doRender);
 }
 
-void RenderPipeline::renderGeometryFrameBuffer(const std::function<void()>& doRender, float farPlane)
+void RenderPipeline::renderGeometryFrameBuffer(const std::function<void()>& doRender, const float farPlane)
 {
   SOGLB_DEBUGGROUP("geometry-pass");
   BOOST_ASSERT(m_geometryPass != nullptr);
@@ -313,11 +321,11 @@ void RenderPipeline::renderGeometryFrameBuffer(const std::function<void()>& doRe
   m_geometryPass->getNormalBuffer()->getTexture()->clear(gl::RGB16F{gl::api::core::Half{}});
   m_geometryPass->render(doRender);
 
-  if constexpr(render::pass::FlushPasses)
+  if constexpr(pass::FlushPasses)
     GL_ASSERT(gl::api::finish());
 }
 
-void RenderPipeline::renderUiFrameBuffer(float alpha)
+void RenderPipeline::renderUiFrameBufferToBackbuffer(const float alpha)
 {
   BOOST_ASSERT(m_uiPass != nullptr);
   m_backbuffer->bind();
@@ -352,4 +360,4 @@ void RenderPipeline::resetBackbuffer()
 {
   m_backbufferTextureHandle->getTexture()->clear({0, 0, 0});
 }
-} // namespace render
+} // namespace render
\ No newline at end of file
diff --git a/src/render/renderpipeline.h b/src/render/renderpipeline.h
index d63a08c02..f150dadd1 100644
--- a/src/render/renderpipeline.h
+++ b/src/render/renderpipeline.h
@@ -42,7 +42,6 @@ namespace render
 {
 class RenderPipeline
 {
-private:
   const std::chrono::high_resolution_clock::time_point m_creationTime = std::chrono::high_resolution_clock::now();
 
   RenderSettings m_renderSettings{};
@@ -72,11 +71,11 @@ class RenderPipeline
 
   void renderGeometryFrameBuffer(const std::function<void()>& doRender, float farPlane);
   void renderPortalFrameBuffer(const std::function<void(const gl::RenderState&)>& doRender);
-  void renderUiFrameBuffer(const std::function<void()>& doRender);
-  void renderUiFrameBuffer(float alpha);
-  void worldCompositionPass(const std::vector<engine::world::Room>& rooms, bool inWater);
+  void renderUiIntoFramebuffer(const std::function<void()>& doRender);
+  void renderUiFrameBufferToBackbuffer(float alpha);
+  void worldCompositionPassToBackbuffer(const std::vector<engine::world::Room>& rooms, bool inWater);
 
-  void updateCamera(const gslu::nn_shared<scene::Camera>& camera);
+  void updateCameraData(const gslu::nn_shared<scene::Camera>& camera);
 
   void resize(material::MaterialManager& materialManager,
               const glm::ivec2& renderViewport,
diff --git a/src/render/rendersystem.cpp b/src/render/rendersystem.cpp
new file mode 100644
index 000000000..1f1238957
--- /dev/null
+++ b/src/render/rendersystem.cpp
@@ -0,0 +1,63 @@
+#include "rendersystem.h"
+
+#include "core/magic.h"
+#include "material/materialmanager.h"
+#include "material/shadercache.h"
+#include "renderpipeline.h"
+#include "rendersettings.h"
+#include "scene/camera.h"
+#include "scene/csm.h"
+#include "scene/scenegraph.h"
+
+#include <gsl-lite/gsl-lite.hpp>
+#include <utility>
+
+namespace render
+{
+RenderSystem::RenderSystem(const std::filesystem::path& engineDataPath,
+                           const glm::ivec2& renderViewport,
+                           const glm::ivec2& uiViewport,
+                           const glm::ivec2& displayViewport,
+                           const RenderSettings& renderSettings,
+                           std::function<float()> interTickFactorProvider)
+    : m_camera{gsl_lite::make_shared<scene::Camera>(
+        core::DefaultFov, renderViewport, core::DefaultNearPlane, core::DefaultFarPlane)}
+    , m_sceneGraph{gsl_lite::make_shared<scene::SceneGraph>(m_camera)}
+    , m_shaderCache{gsl_lite::make_shared<material::ShaderCache>(engineDataPath / "shaders")}
+    , m_materialManager{gsl_lite::make_unique<material::MaterialManager>(m_shaderCache,
+                                                                         m_camera,
+                                                                         std::move(interTickFactorProvider),
+                                                                         [this]()
+                                                                         {
+                                                                           return m_sceneGraph->getGameTime();
+                                                                         })}
+    , m_csm{gsl_lite::make_shared<scene::CSM>(renderSettings.getCSMResolution(), *m_materialManager)}
+{
+  m_materialManager->setCSM(m_csm);
+  m_renderPipeline = std::make_unique<RenderPipeline>(*m_materialManager, renderViewport, uiViewport, displayViewport);
+}
+
+RenderSystem::~RenderSystem() = default;
+
+void RenderSystem::apply(const RenderSettings& renderSettings,
+                         const glm::ivec2& renderViewport,
+                         const glm::ivec2& uiViewport,
+                         const glm::ivec2& displayViewport)
+{
+  m_camera->setViewport(renderViewport);
+
+  if(m_csm->getResolution() != renderSettings.getCSMResolution())
+  {
+    m_csm = gsl_lite::make_shared<scene::CSM>(renderSettings.getCSMResolution(), *m_materialManager);
+    m_materialManager->setCSM(gsl_lite::not_null{m_csm});
+  }
+
+  m_renderPipeline->apply(renderSettings, *m_materialManager);
+  m_materialManager->setFiltering(renderSettings.bilinearFiltering,
+                                  !renderSettings.anisotropyActive
+                                    ? std::nullopt
+                                    : std::optional{static_cast<float>(renderSettings.anisotropyLevel)});
+
+  m_renderPipeline->resize(*m_materialManager, renderViewport, uiViewport, displayViewport);
+}
+} // namespace render
diff --git a/src/render/rendersystem.h b/src/render/rendersystem.h
new file mode 100644
index 000000000..c4edc8405
--- /dev/null
+++ b/src/render/rendersystem.h
@@ -0,0 +1,107 @@
+#pragma once
+
+#include <filesystem>
+#include <functional>
+#include <glm/vec2.hpp>
+#include <gslu.h>
+#include <memory>
+
+namespace render
+{
+class RenderPipeline;
+struct RenderSettings;
+} // namespace render
+
+namespace render::scene
+{
+class Camera;
+class CSM;
+class SceneGraph;
+} // namespace render::scene
+
+namespace render::material
+{
+class MaterialManager;
+class ShaderCache;
+} // namespace render::material
+
+namespace render
+{
+/**
+ * @brief Complete rendering subsystem.
+ *
+ * This class consolidates all rendering infrastructure including the scene graph,
+ * rendering assets (shaders, materials), shadow maps (CSM), and the render pipeline.
+ * It provides a clean interface for high-level rendering operations.
+ */
+class RenderSystem final
+{
+public:
+  RenderSystem(const std::filesystem::path& engineDataPath,
+               const glm::ivec2& renderViewport,
+               const glm::ivec2& uiViewport,
+               const glm::ivec2& displayViewport,
+               const RenderSettings& renderSettings,
+               std::function<float()> interTickFactorProvider);
+
+  ~RenderSystem();
+
+  [[nodiscard]] auto& getSceneGraph() noexcept
+  {
+    return *m_sceneGraph;
+  }
+
+  [[nodiscard]] const auto& getSceneGraph() const noexcept
+  {
+    return *m_sceneGraph;
+  }
+
+  [[nodiscard]] auto& getRenderPipeline() noexcept
+  {
+    return *m_renderPipeline;
+  }
+
+  [[nodiscard]] const auto& getRenderPipeline() const noexcept
+  {
+    return *m_renderPipeline;
+  }
+
+  [[nodiscard]] auto& getCSM() noexcept
+  {
+    return *m_csm;
+  }
+
+  [[nodiscard]] const auto& getCSM() const noexcept
+  {
+    return *m_csm;
+  }
+
+  [[nodiscard]] auto& getMaterialManager() noexcept
+  {
+    return *m_materialManager;
+  }
+
+  [[nodiscard]] const auto& getMaterialManager() const noexcept
+  {
+    return *m_materialManager;
+  }
+
+  [[nodiscard]] const auto& getCamera() const noexcept
+  {
+    return m_camera;
+  }
+
+  void apply(const RenderSettings& renderSettings,
+             const glm::ivec2& renderViewport,
+             const glm::ivec2& uiViewport,
+             const glm::ivec2& displayViewport);
+
+private:
+  gslu::nn_shared<scene::Camera> m_camera;
+  gslu::nn_shared<scene::SceneGraph> m_sceneGraph;
+  gslu::nn_shared<material::ShaderCache> m_shaderCache;
+  gslu::nn_unique<material::MaterialManager> m_materialManager;
+  gslu::nn_shared<scene::CSM> m_csm;
+  std::unique_ptr<RenderPipeline> m_renderPipeline;
+};
+} // namespace render
diff --git a/src/render/scene/blur.h b/src/render/scene/blur.h
index 2198584dd..ed604354c 100644
--- a/src/render/scene/blur.h
+++ b/src/render/scene/blur.h
@@ -12,7 +12,7 @@
 #include <gl/framebuffer.h>
 #include <gl/soglb_fwd.h>
 #include <gl/texturehandle.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -28,10 +28,10 @@ class SingleBlur
   explicit SingleBlur(std::string name,
                       material::MaterialManager& materialManager,
                       // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-                      uint8_t dir,
-                      uint8_t extent,
+                      const uint8_t dir,
+                      const uint8_t extent,
                       bool gauss,
-                      int downscale)
+                      const int downscale)
       : m_name{std::move(name)}
       , m_material{gauss ? materialManager.getFastGaussBlur(extent, dir, PixelT::Channels)
                          : materialManager.getFastBoxBlur(extent, dir, PixelT::Channels)}
@@ -45,8 +45,8 @@ class SingleBlur
   void setInput(const gslu::nn_shared<TextureHandle>& src)
   {
     m_blurredTexture = std::make_shared<TextureHandle>(
-      gsl::make_shared<gl::Texture2D<PixelT>>(src->getTexture()->size() / m_downscale, m_name + "/blurred"),
-      gsl::make_unique<gl::Sampler>(m_name + "/blurred" + gl::SamplerSuffix)
+      gsl_lite::make_shared<gl::Texture2D<PixelT>>(src->getTexture()->size() / m_downscale, m_name + "/blurred"),
+      gsl_lite::make_unique<gl::Sampler>(m_name + "/blurred" + gl::SamplerSuffix)
         | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
         | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge)
         | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear));
@@ -76,7 +76,7 @@ class SingleBlur
 
   [[nodiscard]] gslu::nn_shared<TextureHandle> getBlurredTexture() const
   {
-    return gsl::not_null{m_blurredTexture};
+    return gsl_lite::not_null{m_blurredTexture};
   }
 
 private:
@@ -114,7 +114,7 @@ class SeparableBlur
       : SeparableBlur{name, materialManager, extent, extent, gauss, downscale}
   {
     if(src != nullptr)
-      setInput(gsl::not_null{src});
+      setInput(gsl_lite::not_null{src});
   }
 
   void setInput(const gslu::nn_shared<TextureHandle>& src)
@@ -139,4 +139,4 @@ class SeparableBlur
   SingleBlur<PixelT> m_blur1;
   SingleBlur<PixelT> m_blur2;
 };
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/camera.h b/src/render/scene/camera.h
index 792ecd991..a2f9bfcea 100644
--- a/src/render/scene/camera.h
+++ b/src/render/scene/camera.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "core/magic.h"
+
 #include <cstdint>
 #include <gl/buffer.h>
 #include <glm/ext/matrix_clip_space.hpp>
@@ -33,6 +35,7 @@ struct CameraMatrices
   float farPlane = 1;
   float _pad = 0;
 };
+
 static_assert(sizeof(CameraMatrices) % 16 == 0);
 
 class Camera final
@@ -41,7 +44,7 @@ class Camera final
 
 public:
   // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-  Camera(float fieldOfView, const glm::vec2& viewport, float nearPlane, float farPlane)
+  Camera(const core::Radians& fieldOfView, const glm::vec2& viewport, const float nearPlane, const float farPlane)
       : m_fieldOfView{fieldOfView}
       , m_matricesBuffer{"camera-matrices-ubo", gl::api::BufferUsage::DynamicDraw, m_matrices}
   {
@@ -61,7 +64,7 @@ class Camera final
 
   ~Camera() = default;
 
-  void setFieldOfView(float fieldOfView) noexcept
+  void setFieldOfView(const core::Radians& fieldOfView) noexcept
   {
     m_fieldOfView = fieldOfView;
     m_dirty.set(CameraMatrices::DirtyFlag::Projection);
@@ -74,6 +77,7 @@ class Camera final
     return m_matrices.aspectRatio;
   }
 
+  // ReSharper disable once CppMemberFunctionMayBeConst
   void setViewport(const glm::vec2& viewport)
   {
     if(glm::vec2{m_matrices.viewport} == viewport)
@@ -101,6 +105,7 @@ class Camera final
     return m_matrices.view;
   }
 
+  // ReSharper disable once CppMemberFunctionMayBeConst
   void setViewMatrix(const glm::mat4& m) noexcept
   {
     m_matrices.view = m;
@@ -117,8 +122,8 @@ class Camera final
   {
     if(m_dirty.is_set(CameraMatrices::DirtyFlag::Projection))
     {
-      m_matrices.projection
-        = glm::perspective(m_fieldOfView, m_matrices.aspectRatio, m_matrices.nearPlane, m_matrices.farPlane);
+      m_matrices.projection = glm::perspective(
+        m_fieldOfView.get<float>(), m_matrices.aspectRatio, m_matrices.nearPlane, m_matrices.farPlane);
       m_dirty.reset(CameraMatrices::DirtyFlag::Projection);
       m_dirty.set(CameraMatrices::DirtyFlag::BufferData);
     }
@@ -157,12 +162,12 @@ class Camera final
 
   [[nodiscard]] glm::vec3 getUpVector() const
   {
-    return getRotatedVector(glm::vec3{0, 1, 0});
+    return getRotatedVector(core::RenderAxisUp);
   }
 
   [[nodiscard]] glm::vec3 getRightVector() const
   {
-    return getRotatedVector(glm::vec3{1, 0, 0});
+    return getRotatedVector(core::RenderAxisRight);
   }
 
   [[nodiscard]] auto getFieldOfViewY() const noexcept
@@ -188,7 +193,7 @@ class Camera final
   }
 
 private:
-  float m_fieldOfView;
+  core::Radians m_fieldOfView;
 
   mutable type_safe::flag_set<CameraMatrices::DirtyFlag> m_dirty;
   mutable CameraMatrices m_matrices{};
diff --git a/src/render/scene/csm.cpp b/src/render/scene/csm.cpp
index c7a394c67..5b49e086b 100644
--- a/src/render/scene/csm.cpp
+++ b/src/render/scene/csm.cpp
@@ -32,7 +32,7 @@
 #include <glm/mat4x4.hpp>
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <limits>
 #include <memory>
@@ -48,16 +48,17 @@ class Node;
 
 namespace render::scene
 {
-void CSM::Split::init(int32_t resolution, size_t idx, material::MaterialManager& materialManager)
+void CSM::Split::init(const int32_t resolution, const size_t idx, material::MaterialManager& materialManager)
 {
-  auto sampler = gsl::make_unique<gl::Sampler>("csm-texture/" + std::to_string(idx) + gl::SamplerSuffix)
+  auto sampler = gsl_lite::make_unique<gl::Sampler>("csm-texture/" + std::to_string(idx) + gl::SamplerSuffix)
                  | set(gl::api::TextureMinFilter::Nearest) | set(gl::api::TextureMagFilter::Nearest)
                  | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToBorder)
                  | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToBorder)
                  | set(gl::api::TextureCompareMode::None);
   sampler->setBorderColor(glm::vec4{1.0f});
   depthTextureHandle = std::make_shared<gl::TextureHandle<gl::TextureDepth<float>>>(
-    gsl::make_shared<gl::TextureDepth<float>>(glm::ivec2{resolution, resolution}, "csm-texture/" + std::to_string(idx)),
+    gsl_lite::make_shared<gl::TextureDepth<float>>(glm::ivec2{resolution, resolution},
+                                                   "csm-texture/" + std::to_string(idx)),
     std::move(sampler));
 
   depthFramebuffer
@@ -66,9 +67,9 @@ void CSM::Split::init(int32_t resolution, size_t idx, material::MaterialManager&
         .build("csm-split-fb/" + std::to_string(idx));
 
   squaredTextureHandle = std::make_shared<gl::TextureHandle<gl::Texture2D<gl::RG16F>>>(
-    gsl::make_shared<gl::Texture2D<gl::RG16F>>(glm::ivec2{resolution, resolution},
-                                               "csm-texture/" + std::to_string(idx) + "/squared"),
-    gsl::make_unique<gl::Sampler>("csm-texture/" + std::to_string(idx) + "/squared" + gl::SamplerSuffix)
+    gsl_lite::make_shared<gl::Texture2D<gl::RG16F>>(glm::ivec2{resolution, resolution},
+                                                    "csm-texture/" + std::to_string(idx) + "/squared"),
+    gsl_lite::make_unique<gl::Sampler>("csm-texture/" + std::to_string(idx) + "/squared" + gl::SamplerSuffix)
       | set(gl::api::TextureMinFilter::Linear) | set(gl::api::TextureMagFilter::Linear)
       | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
       | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge));
@@ -83,14 +84,14 @@ void CSM::Split::init(int32_t resolution, size_t idx, material::MaterialManager&
   squareMesh->bind("u_shadow",
                    [this](const Node* /*node*/, const Mesh& /*mesh*/, gl::Uniform& uniform)
                    {
-                     uniform.set(gsl::not_null{depthTextureHandle});
+                     uniform.set(gsl_lite::not_null{depthTextureHandle});
                    });
   squareMesh->getRenderState().merge(squareFramebuffer->getRenderState());
   squareMesh->getMaterialGroup().set(material::RenderMode::FullOpaque, squareMaterial);
 
   squareBlur = std::make_shared<SeparableBlur<gl::RG16F>>(
     "squareBlur-" + std::to_string(idx), materialManager, uint8_t{2}, true);
-  squareBlur->setInput(gsl::not_null{squaredTextureHandle});
+  squareBlur->setInput(gsl_lite::not_null{squaredTextureHandle});
 }
 
 // NOLINTNEXTLINE(readability-make-member-function-const)
@@ -111,7 +112,7 @@ void CSM::Split::renderBlur()
   squareBlur->render();
 }
 
-CSM::CSM(int32_t resolution, material::MaterialManager& materialManager)
+CSM::CSM(const int32_t resolution, material::MaterialManager& materialManager)
     : m_resolution{resolution}
     , m_buffer{"csm-data-ubo", gl::api::BufferUsage::DynamicDraw, m_bufferData}
 {
@@ -151,13 +152,12 @@ std::array<gslu::nn_shared<gl::TextureHandle<gl::Texture2D<gl::RG16F>>>, CSMBuff
 std::array<glm::mat4, CSMBuffer::NSplits> CSM::getMatrices(const glm::mat4& modelMatrix) const
 {
   std::array<glm::mat4, CSMBuffer::NSplits> result{};
-  std::transform(m_splits.begin(),
-                 m_splits.end(),
-                 result.begin(),
-                 [modelMatrix](const Split& split)
-                 {
-                   return split.vpMatrix * modelMatrix;
-                 });
+  std::ranges::transform(m_splits,
+                         result.begin(),
+                         [modelMatrix](const Split& split)
+                         {
+                           return split.vpMatrix * modelMatrix;
+                         });
   return result;
 }
 
@@ -197,13 +197,13 @@ void CSM::updateCamera(const Camera& camera)
     const auto nc = position + forward * cascadeSplits[cascadeIterator];
     const auto fc = position + forward * cascadeSplits[cascadeIterator + 1];
 
-    const auto Hnear = glm::tan(camera.getFieldOfViewY() / 2) * cascadeSplits[cascadeIterator];
+    const auto Hnear = glm::tan(camera.getFieldOfViewY().get<>() / 2) * cascadeSplits[cascadeIterator];
     const auto Wnear = Hnear * camera.getAspectRatio();
-    const auto Hfar = glm::tan(camera.getFieldOfViewY() / 2) * cascadeSplits[cascadeIterator + 1];
+    const auto Hfar = glm::tan(camera.getFieldOfViewY().get<>() / 2) * cascadeSplits[cascadeIterator + 1];
     const auto Wfar = Hfar * camera.getAspectRatio();
 
     // frustum corners are in world space
-    const std::array<glm::vec3, 8> frustumCorners{
+    const std::array frustumCorners{
       fc + up * Hfar - right * Wfar,
       fc + up * Hfar + right * Wfar,
       fc - up * Hfar - right * Wfar,
@@ -244,7 +244,9 @@ gl::UniformBuffer<CSMBuffer>& CSM::getBuffer(const glm::mat4& modelMatrix)
   return m_buffer;
 }
 
-void CSM::renderToActiveDepthBuffer(const std::function<void(const gl::RenderState&, const glm::mat4&)>& doRender) const
+void CSM::renderToActiveDepthBuffer(
+
+  const std::function<void(const gl::RenderState&, const glm::mat4&)>& doRender) const
 {
   SOGLB_DEBUGGROUP("csm-pass/" + std::to_string(m_activeSplit));
   auto& split = m_splits.at(m_activeSplit);
@@ -256,7 +258,7 @@ void CSM::renderToActiveDepthBuffer(const std::function<void(const gl::RenderSta
 
 void CSM::renderSquareBuffers()
 {
-  for(size_t i = 0; i < render::scene::CSMBuffer::NSplits; ++i)
+  for(size_t i = 0; i < CSMBuffer::NSplits; ++i)
   {
     SOGLB_DEBUGGROUP("csm-pass-square/" + std::to_string(i));
     m_splits[i].renderSquare();
@@ -265,10 +267,10 @@ void CSM::renderSquareBuffers()
 
 void CSM::renderBlurBuffers()
 {
-  for(size_t i = 0; i < render::scene::CSMBuffer::NSplits; ++i)
+  for(size_t i = 0; i < CSMBuffer::NSplits; ++i)
   {
     SOGLB_DEBUGGROUP("csm-pass-blur/" + std::to_string(i));
     m_splits[i].renderBlur();
   }
 }
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/csm.h b/src/render/scene/csm.h
index 440eb997e..d8e7b65de 100644
--- a/src/render/scene/csm.h
+++ b/src/render/scene/csm.h
@@ -13,7 +13,7 @@
 #include <glm/fwd.hpp>
 #include <glm/mat4x4.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 
@@ -38,6 +38,7 @@ struct CSMBuffer
   std::array<glm::mat4, NSplits> lightMVP{};
   glm::vec4 lightDir{};
 };
+
 static_assert(sizeof(CSMBuffer) % 16 == 0);
 
 class CSM final
@@ -76,7 +77,7 @@ class CSM final
   void renderSquareBuffers();
   void renderBlurBuffers();
 
-  void setActiveSplit(size_t idx)
+  void setActiveSplit(const size_t idx)
   {
     gsl_Expects(idx < m_splits.size());
     m_activeSplit = idx;
@@ -100,4 +101,4 @@ class CSM final
   CSMBuffer m_bufferData;
   gl::UniformBuffer<CSMBuffer> m_buffer;
 };
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/mesh.cpp b/src/render/scene/mesh.cpp
index 985a4257d..690302df7 100644
--- a/src/render/scene/mesh.cpp
+++ b/src/render/scene/mesh.cpp
@@ -16,7 +16,7 @@
 #include <gl/vertexarray.h>
 #include <gl/vertexbuffer.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -30,7 +30,7 @@ class Node;
 gslu::nn_shared<Mesh> createScreenQuad(const glm::vec2& xy,
                                        const glm::vec2& size,
                                        const std::shared_ptr<material::Material>& material,
-                                       Translucency spriteTranslucency,
+                                       const Translucency spriteTranslucency,
                                        const std::string& label)
 {
   struct Vertex
@@ -41,20 +41,20 @@ gslu::nn_shared<Mesh> createScreenQuad(const glm::vec2& xy,
 
   const auto tl = xy;
   const auto br = xy + size;
-  const std::array<Vertex, 4> vertices{Vertex{{tl.x, tl.y}, {0.0f, 0.0f}},
-                                       Vertex{{br.x, tl.y}, {1.0f, 0.0f}},
-                                       Vertex{{br.x, br.y}, {1.0f, 1.0f}},
-                                       Vertex{{tl.x, br.y}, {0.0f, 1.0f}}};
+  const std::array vertices{Vertex{{tl.x, tl.y}, {0.0f, 0.0f}},
+                            Vertex{{br.x, tl.y}, {1.0f, 0.0f}},
+                            Vertex{{br.x, br.y}, {1.0f, 1.0f}},
+                            Vertex{{tl.x, br.y}, {0.0f, 1.0f}}};
 
   static const gl::VertexLayout<Vertex> layout{{VERTEX_ATTRIBUTE_POSITION_NAME, &Vertex::pos},
                                                {VERTEX_ATTRIBUTE_TEXCOORD_PREFIX_NAME, &Vertex::uv}};
 
-  auto vertexBuffer = gsl::make_shared<gl::VertexBuffer<Vertex>>(
+  auto vertexBuffer = gsl_lite::make_shared<gl::VertexBuffer<Vertex>>(
     layout, label + gl::VboSuffix, gl::api::BufferUsage::StaticDraw, vertices);
 
-  static const std::array<uint16_t, 6> indices{0, 1, 2, 0, 2, 3};
+  static constexpr std::array<uint16_t, 6> indices{0, 1, 2, 0, 2, 3};
 
-  auto indexBuffer = gsl::make_shared<gl::ElementArrayBuffer<uint16_t>>(
+  auto indexBuffer = gsl_lite::make_shared<gl::ElementArrayBuffer<uint16_t>>(
     label + gl::IndexBufferSuffix, gl::api::BufferUsage::StaticDraw, indices);
 
   const auto vao = std::make_shared<gl::VertexArray<uint16_t, Vertex>>(
@@ -72,7 +72,8 @@ gslu::nn_shared<Mesh> createScreenQuad(const glm::vec2& xy,
     break;
   }
 
-  auto mesh = gsl::make_shared<MeshImpl<uint16_t, Vertex>>(opaqueVao, nonOpaqueVao, gl::api::PrimitiveType::Triangles);
+  auto mesh
+    = gsl_lite::make_shared<MeshImpl<uint16_t, Vertex>>(opaqueVao, nonOpaqueVao, gl::api::PrimitiveType::Triangles);
   mesh->getRenderState().setCullFace(false);
   mesh->getRenderState().setDepthWrite(false);
   mesh->getRenderState().setDepthTest(false);
@@ -102,7 +103,7 @@ void Mesh::render(const Node* node, RenderContext& context)
   context.popState();
 }
 
-void Mesh::render(const Node* node, RenderContext& context, gl::api::core::SizeType instanceCount)
+void Mesh::render(const Node* node, RenderContext& context, const gl::api::core::SizeType instanceCount)
 {
   const std::shared_ptr<material::Material> material = m_materialGroup.get(context.getRenderMode());
   if(material == nullptr)
@@ -119,4 +120,4 @@ void Mesh::render(const Node* node, RenderContext& context, gl::api::core::SizeT
   context.popState();
   context.popState();
 }
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/mesh.h b/src/render/scene/mesh.h
index 1a17c0cf4..e45f43c44 100644
--- a/src/render/scene/mesh.h
+++ b/src/render/scene/mesh.h
@@ -29,7 +29,7 @@ class Mesh
     , public material::MaterialParameterOverrider
 {
 public:
-  explicit Mesh(gl::api::PrimitiveType primitiveType)
+  explicit Mesh(const gl::api::PrimitiveType primitiveType)
       : m_primitiveType{primitiveType}
   {
   }
@@ -73,7 +73,7 @@ class MeshImpl : public Mesh
 public:
   explicit MeshImpl(std::shared_ptr<gl::VertexArray<IndexT, VertexTs...>> vaoOpaque,
                     std::shared_ptr<gl::VertexArray<IndexT, VertexTs...>> vaoNonOpaque,
-                    gl::api::PrimitiveType primitiveType)
+                    const gl::api::PrimitiveType primitiveType)
       : Mesh{primitiveType}
       , m_vaoOpaque{std::move(vaoOpaque)}
       , m_vaoNonOpaque{std::move(vaoNonOpaque)}
@@ -91,7 +91,7 @@ class MeshImpl : public Mesh
   std::shared_ptr<gl::VertexArray<IndexT, VertexTs...>> m_vaoOpaque;
   std::shared_ptr<gl::VertexArray<IndexT, VertexTs...>> m_vaoNonOpaque;
 
-  void drawElements(Translucency translucencySelector) override
+  void drawElements(const Translucency translucencySelector) override
   {
     switch(translucencySelector)
     {
@@ -106,7 +106,7 @@ class MeshImpl : public Mesh
     }
   }
 
-  void drawElements(Translucency translucencySelector, gl::api::core::SizeType instanceCount) override
+  void drawElements(const Translucency translucencySelector, gl::api::core::SizeType instanceCount) override
   {
     switch(translucencySelector)
     {
@@ -121,7 +121,7 @@ class MeshImpl : public Mesh
     }
   }
 
-  [[nodiscard]] bool empty(Translucency translucencySelector) const override
+  [[nodiscard]] bool empty(const Translucency translucencySelector) const override
   {
     switch(translucencySelector)
     {
@@ -143,14 +143,14 @@ extern gslu::nn_shared<Mesh> createScreenQuad(const glm::vec2& xy,
 
 inline gslu::nn_shared<Mesh> createScreenQuad(const glm::vec2& size,
                                               const std::shared_ptr<material::Material>& material,
-                                              Translucency spriteTranslucency,
+                                              const Translucency spriteTranslucency,
                                               const std::string& label)
 {
   return createScreenQuad({0, 0}, size, material, spriteTranslucency, label);
 }
 
 inline gslu::nn_shared<Mesh> createScreenQuad(const std::shared_ptr<material::Material>& material,
-                                              Translucency spriteTranslucency,
+                                              const Translucency spriteTranslucency,
                                               const std::string& label)
 {
   return createScreenQuad({0, 0}, {0, 0}, material, spriteTranslucency, label);
diff --git a/src/render/scene/node.cpp b/src/render/scene/node.cpp
index b5287648c..24747551a 100644
--- a/src/render/scene/node.cpp
+++ b/src/render/scene/node.cpp
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <optional>
 #include <tuple>
@@ -15,15 +15,14 @@ namespace render::scene
 {
 Node::~Node()
 {
-  if(auto p = m_parent.lock())
+  if(const auto p = m_parent.lock())
   {
     auto& children = p->m_children;
-    const auto it = std::find_if(children.begin(),
-                                 children.end(),
-                                 [this](const gslu::nn_shared<Node>& node)
-                                 {
-                                   return node.get().get() == this;
-                                 });
+    const auto it = std::ranges::find_if(children,
+                                         [this](const gslu::nn_shared<Node>& node)
+                                         {
+                                           return node.get().get() == this;
+                                         });
     if(it != children.end())
       children.erase(it);
   }
@@ -54,7 +53,7 @@ void Node::accept(Visitor& visitor) const
 
   if(m_renderable != nullptr)
   {
-    visitor.add(gsl::not_null{this});
+    visitor.add(gsl_lite::not_null{this});
   }
 
   for(const auto& child : m_children)
@@ -88,4 +87,4 @@ std::tuple<core::Interval<float>, core::Interval<float>> Node::getCombinedScisso
   }
   return {xInterval, yInterval};
 }
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/node.h b/src/render/scene/node.h
index 21700de5d..984198dca 100644
--- a/src/render/scene/node.h
+++ b/src/render/scene/node.h
@@ -10,7 +10,7 @@
 #include <gl/renderstate.h>
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <stdexcept>
@@ -57,7 +57,7 @@ class Node : public material::MaterialParameterOverrider
     return m_parent;
   }
 
-  void setVisible(bool visible)
+  void setVisible(const bool visible)
   {
     m_visible = visible;
   }
@@ -135,12 +135,11 @@ class Node : public material::MaterialParameterOverrider
 
   [[nodiscard]] std::shared_ptr<Node> findChild(const Node* node) const
   {
-    const auto it = std::find_if(m_children.begin(),
-                                 m_children.end(),
-                                 [node](const gslu::nn_shared<Node>& ptr)
-                                 {
-                                   return ptr.get().get() == node;
-                                 });
+    const auto it = std::ranges::find_if(m_children,
+                                         [node](const gslu::nn_shared<Node>& ptr)
+                                         {
+                                           return ptr.get().get() == node;
+                                         });
 
     if(it == m_children.end())
       return nullptr;
@@ -166,8 +165,7 @@ class Node : public material::MaterialParameterOverrider
 
   void clear()
   {
-    auto tmp = m_children;
-    for(const auto& node : tmp)
+    for(const auto tmp = m_children; const auto& node : tmp)
       setParent(node, nullptr);
   }
 
@@ -198,7 +196,7 @@ class Node : public material::MaterialParameterOverrider
     return m_renderOrder;
   }
 
-  void setRenderOrder(int order)
+  void setRenderOrder(const int order)
   {
     m_renderOrder = order;
   }
@@ -233,7 +231,8 @@ class Node : public material::MaterialParameterOverrider
   friend void setParent(Node* node, const std::shared_ptr<Node>& newParent);
 };
 
-inline void setParent(gslu::nn_shared<Node> node, // NOLINT(performance-unnecessary-value-param)
+inline void setParent(gslu::nn_shared<Node> node,
+                      // NOLINT(performance-unnecessary-value-param)
                       const std::shared_ptr<Node>& newParent)
 {
   // first remove from hierarchy
@@ -242,7 +241,7 @@ inline void setParent(gslu::nn_shared<Node> node, // NOLINT(performance-unnecess
     if(currentParent == newParent)
       return;
 
-    const auto it = std::find(currentParent->m_children.begin(), currentParent->m_children.end(), node);
+    const auto it = std::ranges::find(currentParent->m_children, node);
     BOOST_ASSERT(it != currentParent->m_children.end());
     node->m_parent.reset();
     currentParent->m_children.erase(it);
@@ -265,7 +264,7 @@ inline void setParent(Node* node, const std::shared_ptr<Node>& newParent)
       return;
 
     const auto sharedNode = currentParent->findChild(node);
-    setParent(gsl::not_null{sharedNode}, newParent);
+    setParent(gsl_lite::not_null{sharedNode}, newParent);
     return;
   }
 
@@ -282,4 +281,4 @@ inline void addChild(const gslu::nn_shared<Node>& node, const gslu::nn_shared<No
 
   setParent(child, node);
 }
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/rendercontext.h b/src/render/scene/rendercontext.h
index 9251a26a9..99b48d5b0 100644
--- a/src/render/scene/rendercontext.h
+++ b/src/render/scene/rendercontext.h
@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <gl/renderstate.h>
 #include <glm/mat4x4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <optional>
 #include <stack>
 
@@ -16,9 +16,9 @@ enum class Translucency : uint8_t;
 class RenderContext final
 {
 public:
-  explicit RenderContext(material::RenderMode renderMode,
+  explicit RenderContext(const material::RenderMode renderMode,
                          const std::optional<glm::mat4>& viewProjection,
-                         Translucency translucencySelector)
+                         const Translucency translucencySelector)
       : m_renderMode{renderMode}
       , m_viewProjection{viewProjection}
       , m_translucencySelector{translucencySelector}
@@ -71,4 +71,4 @@ class RenderContext final
   std::optional<glm::mat4> m_viewProjection;
   Translucency m_translucencySelector;
 };
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/renderer.cpp b/src/render/scene/scenegraph.cpp
similarity index 77%
rename from src/render/scene/renderer.cpp
rename to src/render/scene/scenegraph.cpp
index da1ecee5a..3f9e90307 100644
--- a/src/render/scene/renderer.cpp
+++ b/src/render/scene/scenegraph.cpp
@@ -1,4 +1,4 @@
-#include "renderer.h"
+#include "scenegraph.h"
 
 #include "camera.h"
 #include "node.h"
@@ -11,7 +11,7 @@
 #include <gl/glassert.h>
 #include <gl/pixel.h>
 #include <gl/renderstate.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <initializer_list>
 #include <memory>
@@ -20,15 +20,15 @@
 
 namespace render::scene
 {
-Renderer::Renderer(gslu::nn_shared<Camera> camera)
+SceneGraph::SceneGraph(gslu::nn_shared<Camera> camera)
     : m_rootNode{std::make_shared<Node>("<rootnode>")}
     , m_camera{std::move(camera)}
 {
 }
 
-Renderer::~Renderer() = default;
+SceneGraph::~SceneGraph() = default;
 
-void Renderer::render()
+void SceneGraph::render() const
 {
   for(const auto translucencySelector : {Translucency::Opaque, Translucency::NonOpaque})
   {
@@ -38,11 +38,11 @@ void Renderer::render()
                           translucencySelector};
     {
       gl::RenderState tmp{};
-      tmp.setDepthWrite(translucencySelector == render::scene::Translucency::Opaque);
+      tmp.setDepthWrite(translucencySelector == Translucency::Opaque);
       context.pushState(tmp);
     }
 
-    Visitor visitor{gsl::not_null{&context}};
+    Visitor visitor{gsl_lite::not_null{&context}};
     m_rootNode->accept(visitor);
     visitor.render(m_camera->getPosition());
 
@@ -50,9 +50,9 @@ void Renderer::render()
   }
 }
 
-void Renderer::clear(const gl::api::core::Bitfield<gl::api::ClearBufferMask>& flags,
-                     const gl::SRGBA8& clearColor,
-                     const float clearDepth)
+void SceneGraph::clear(const gl::api::core::Bitfield<gl::api::ClearBufferMask>& flags,
+                       const gl::SRGBA8& clearColor,
+                       const float clearDepth)
 {
   gl::api::core::Bitfield<gl::api::ClearBufferMask> bits;
   if(flags.isSet(gl::api::ClearBufferMask::ColorBufferBit))
@@ -85,8 +85,8 @@ void Renderer::clear(const gl::api::core::Bitfield<gl::api::ClearBufferMask>& fl
   GL_ASSERT(gl::api::clear(bits));
 }
 
-void Renderer::resetRootNode()
+void SceneGraph::resetRootNode()
 {
-  m_rootNode = gsl::make_shared<Node>("<rootnode>");
+  m_rootNode = gsl_lite::make_shared<Node>("<rootnode>");
 }
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/renderer.h b/src/render/scene/scenegraph.h
similarity index 68%
rename from src/render/scene/renderer.h
rename to src/render/scene/scenegraph.h
index aa3f1df1b..9179afb94 100644
--- a/src/render/scene/renderer.h
+++ b/src/render/scene/scenegraph.h
@@ -11,35 +11,35 @@ namespace render::scene
 class Camera;
 class Node;
 
-class Renderer final
+class SceneGraph final
 {
 public:
-  Renderer(const Renderer&) = delete;
-  Renderer(Renderer&&) = delete;
-  Renderer& operator=(const Renderer&) = delete;
-  Renderer& operator=(Renderer&&) = delete;
+  SceneGraph(const SceneGraph&) = delete;
+  SceneGraph(SceneGraph&&) = delete;
+  SceneGraph& operator=(const SceneGraph&) = delete;
+  SceneGraph& operator=(SceneGraph&&) = delete;
 
-  explicit Renderer(gslu::nn_shared<Camera> camera);
+  explicit SceneGraph(gslu::nn_shared<Camera> camera);
 
-  ~Renderer();
+  ~SceneGraph();
 
   [[nodiscard]] std::chrono::high_resolution_clock::time_point getGameTime() const
   {
     return std::chrono::high_resolution_clock::now() - m_constructionTime.time_since_epoch();
   }
 
-  void render();
+  void render() const;
 
   void clear(const gl::api::core::Bitfield<gl::api::ClearBufferMask>& flags,
              const gl::SRGBA8& clearColor,
              float clearDepth);
 
   void clear(const gl::api::core::Bitfield<gl::api::ClearBufferMask>& flags,
-             uint8_t red,
-             uint8_t green,
-             uint8_t blue,
-             uint8_t alpha,
-             float clearDepth)
+             const uint8_t red,
+             const uint8_t green,
+             const uint8_t blue,
+             const uint8_t alpha,
+             const float clearDepth)
   {
     clear(flags, gl::SRGBA8{red, green, blue, alpha}, clearDepth);
   }
@@ -49,11 +49,6 @@ class Renderer final
     return m_rootNode;
   }
 
-  [[nodiscard]] const auto& getCamera() const
-  {
-    return m_camera;
-  }
-
   void resetRootNode();
 
 private:
diff --git a/src/render/scene/screenoverlay.cpp b/src/render/scene/screenoverlay.cpp
index c606466f6..15ec9d0ad 100644
--- a/src/render/scene/screenoverlay.cpp
+++ b/src/render/scene/screenoverlay.cpp
@@ -16,7 +16,7 @@
 #include <gl/texture2d.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <stdexcept>
 #include <string>
@@ -51,23 +51,23 @@ void ScreenOverlay::init(material::MaterialManager& materialManager, const glm::
     BOOST_THROW_EXCEPTION(std::runtime_error("Cannot create screen overlay because the viewport is empty"));
   }
 
-  auto texture = gsl::make_shared<gl::Texture2D<gl::PremultipliedSRGBA8>>(m_image->getSize(), "screenoverlay");
+  auto texture = gsl_lite::make_shared<gl::Texture2D<gl::PremultipliedSRGBA8>>(m_image->getSize(), "screenoverlay");
   texture->assign(m_image->getData());
   m_texture = std::make_shared<gl::TextureHandle<gl::Texture2D<gl::PremultipliedSRGBA8>>>(
     texture,
-    gsl::make_unique<gl::Sampler>("screenoverlay" + gl::SamplerSuffix) | set(gl::api::TextureMinFilter::Nearest)
+    gsl_lite::make_unique<gl::Sampler>("screenoverlay" + gl::SamplerSuffix) | set(gl::api::TextureMinFilter::Nearest)
       | set(gl::api::TextureMagFilter::Nearest)
       | set(gl::api::SamplerParameterI::TextureWrapS, gl::api::TextureWrapMode::ClampToEdge)
       | set(gl::api::SamplerParameterI::TextureWrapT, gl::api::TextureWrapMode::ClampToEdge));
 
   m_mesh = createScreenQuad(materialManager.getFlat(true, true), Translucency::NonOpaque, "screenoverlay");
   m_mesh->bind("u_input",
-               [this](const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+               [this](const Node* /*node*/, const Mesh& /*mesh*/, gl::Uniform& uniform)
                {
-                 uniform.set(gsl::not_null{m_texture});
+                 uniform.set(gsl_lite::not_null{m_texture});
                });
   m_mesh->bind("u_alphaMultiplier",
-               [this](const render::scene::Node* /*node*/, const render::scene::Mesh& /*mesh*/, gl::Uniform& uniform)
+               [this](const Node* /*node*/, const Mesh& /*mesh*/, gl::Uniform& uniform)
                {
                  uniform.set(m_alphaMultiplier);
                });
@@ -85,4 +85,4 @@ bool ScreenOverlay::empty(Translucency /*translucencySelector*/) const
 {
   return false;
 }
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/screenoverlay.h b/src/render/scene/screenoverlay.h
index e7527ca35..9a82b70f1 100644
--- a/src/render/scene/screenoverlay.h
+++ b/src/render/scene/screenoverlay.h
@@ -21,7 +21,7 @@ class Mesh;
 class Node;
 class RenderContext;
 
-class ScreenOverlay : public Renderable
+class ScreenOverlay final : public Renderable
 {
 public:
   ScreenOverlay(const ScreenOverlay&) = delete;
@@ -35,7 +35,7 @@ class ScreenOverlay : public Renderable
 
   ~ScreenOverlay() override;
 
-  void render(const Node* node, RenderContext& context) final;
+  void render(const Node* node, RenderContext& context) override;
   void render(const Node* node, RenderContext& context, gl::api::core::SizeType instanceCount) override;
   [[nodiscard]] bool empty(Translucency translucencySelector) const override;
 
@@ -44,7 +44,7 @@ class ScreenOverlay : public Renderable
     return m_image;
   }
 
-  void setAlphaMultiplier(float value)
+  void setAlphaMultiplier(const float value)
   {
     m_alphaMultiplier = value;
   }
diff --git a/src/render/scene/sprite.cpp b/src/render/scene/sprite.cpp
index 54b38296e..8d6853e7a 100644
--- a/src/render/scene/sprite.cpp
+++ b/src/render/scene/sprite.cpp
@@ -17,7 +17,7 @@
 #include <gl/vertexbuffer.h>
 #include <glm/mat4x4.hpp>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -37,7 +37,7 @@ std::array<SpriteVertex, 4> createSpriteVertices(const float x0,
                                                  const int textureIdx)
 {
   BOOST_ASSERT(textureIdx >= 0);
-  const std::array<SpriteVertex, 4> vertices{
+  const std::array vertices{
     SpriteVertex{{x0, y0, 0}, {t0.x, t0.y, textureIdx}},
     SpriteVertex{{x1, y0, 0}, {t1.x, t0.y, textureIdx}},
     SpriteVertex{{x1, y1, 0}, {t1.x, t1.y, textureIdx}},
@@ -46,22 +46,22 @@ std::array<SpriteVertex, 4> createSpriteVertices(const float x0,
   return vertices;
 }
 
-gslu::nn_shared<gl::VertexBuffer<SpriteVertex>> createSpriteVertexBuffer(float x0,
-                                                                         float y0,
-                                                                         float x1,
-                                                                         float y1,
+gslu::nn_shared<gl::VertexBuffer<SpriteVertex>> createSpriteVertexBuffer(const float x0,
+                                                                         const float y0,
+                                                                         const float x1,
+                                                                         const float y1,
                                                                          const glm::vec2& t0,
                                                                          const glm::vec2& t1,
-                                                                         int textureIdx,
-                                                                         bool instanced,
+                                                                         const int textureIdx,
+                                                                         const bool instanced,
                                                                          const std::string& label)
 {
   const auto vertices = createSpriteVertices(x0, y0, x1, y1, t0, t1, textureIdx);
-  return gsl::make_shared<gl::VertexBuffer<SpriteVertex>>(instanced ? SpriteVertex::getInstancedLayout()
-                                                                    : SpriteVertex::getLayout(),
-                                                          label + gl::VboSuffix,
-                                                          gl::api::BufferUsage::StaticDraw,
-                                                          vertices);
+  return gsl_lite::make_shared<gl::VertexBuffer<SpriteVertex>>(instanced ? SpriteVertex::getInstancedLayout()
+                                                                         : SpriteVertex::getLayout(),
+                                                               label + gl::VboSuffix,
+                                                               gl::api::BufferUsage::StaticDraw,
+                                                               vertices);
 }
 } // namespace
 
@@ -71,21 +71,21 @@ gslu::nn_shared<Mesh> createSpriteMesh(const float x0,
                                        const float y1,
                                        const glm::vec2& t0,
                                        const glm::vec2& t1,
-                                       material::RenderMode renderMode,
+                                       const material::RenderMode renderMode,
                                        const gslu::nn_shared<material::Material>& materialFull,
                                        const int textureIdx,
                                        const std::string& label)
 {
   auto vb = createSpriteVertexBuffer(x0, y0, x1, y1, t0, t1, textureIdx, false, label);
-  static const std::array<uint16_t, 6> indices{0, 1, 2, 0, 2, 3};
+  static constexpr std::array<uint16_t, 6> indices{0, 1, 2, 0, 2, 3};
 
-  auto indexBuffer = gsl::make_shared<gl::ElementArrayBuffer<uint16_t>>(
+  auto indexBuffer = gsl_lite::make_shared<gl::ElementArrayBuffer<uint16_t>>(
     label + gl::IndexBufferSuffix, gl::api::BufferUsage::StaticDraw, indices);
 
-  auto nonOpaqueVao = gsl::make_shared<gl::VertexArray<uint16_t, SpriteVertex>>(
+  auto nonOpaqueVao = gsl_lite::make_shared<gl::VertexArray<uint16_t, SpriteVertex>>(
     indexBuffer, vb, std::vector{&materialFull->getShaderProgram()->getHandle()}, label + gl::VaoSuffix);
   auto mesh
-    = gsl::make_shared<MeshImpl<uint16_t, SpriteVertex>>(nullptr, nonOpaqueVao, gl::api::PrimitiveType::Triangles);
+    = gsl_lite::make_shared<MeshImpl<uint16_t, SpriteVertex>>(nullptr, nonOpaqueVao, gl::api::PrimitiveType::Triangles);
   mesh->getMaterialGroup().set(renderMode, materialFull);
   mesh->getRenderState().setScissorTest(false);
 
@@ -99,7 +99,7 @@ std::tuple<gslu::nn_shared<Mesh>, gslu::nn_shared<gl::VertexBuffer<glm::mat4>>>
                             const float y1,
                             const glm::vec2& t0,
                             const glm::vec2& t1,
-                            material::RenderMode renderMode,
+                            const material::RenderMode renderMode,
                             const gslu::nn_shared<material::Material>& materialFull,
                             const int textureIdx,
                             const std::string& label)
@@ -108,24 +108,23 @@ std::tuple<gslu::nn_shared<Mesh>, gslu::nn_shared<gl::VertexBuffer<glm::mat4>>>
 
   static const gl::VertexLayout<glm::mat4> layout{
     {VERTEX_ATTRIBUTE_MODEL_MATRIX_NAME, gl::VertexAttribute<glm::mat4>::Single{}}};
-  const auto modelMatrices
-    = gsl::make_shared<gl::VertexBuffer<glm::mat4>>(layout,
-                                                    label + "-matrices" + gl::VboSuffix,
-                                                    gl::api::BufferUsage::StreamDraw,
-                                                    std::vector<glm::mat4>(4096, glm::mat4{0.0f}),
-                                                    1);
+  const auto modelMatrices = gsl_lite::make_shared<gl::VertexBuffer<glm::mat4>>(layout,
+                                                                                label + "-matrices" + gl::VboSuffix,
+                                                                                gl::api::BufferUsage::StreamDraw,
+                                                                                std::vector(4096, glm::mat4{0.0f}),
+                                                                                1);
 
-  static const std::array<uint16_t, 6> indices{0, 1, 2, 0, 2, 3};
-  auto indexBuffer = gsl::make_shared<gl::ElementArrayBuffer<uint16_t>>(
+  static constexpr std::array<uint16_t, 6> indices{0, 1, 2, 0, 2, 3};
+  auto indexBuffer = gsl_lite::make_shared<gl::ElementArrayBuffer<uint16_t>>(
     label + gl::IndexBufferSuffix, gl::api::BufferUsage::StaticDraw, indices);
 
-  auto vao = gsl::make_shared<gl::VertexArray<uint16_t, SpriteVertex, glm::mat4>>(
+  auto vao = gsl_lite::make_shared<gl::VertexArray<uint16_t, SpriteVertex, glm::mat4>>(
     indexBuffer,
     std::tuple{vertices, modelMatrices},
     std::vector{&materialFull->getShaderProgram()->getHandle()},
     label + gl::VaoSuffix);
-  auto mesh
-    = gsl::make_shared<MeshImpl<uint16_t, SpriteVertex, glm::mat4>>(nullptr, vao, gl::api::PrimitiveType::Triangles);
+  auto mesh = gsl_lite::make_shared<MeshImpl<uint16_t, SpriteVertex, glm::mat4>>(
+    nullptr, vao, gl::api::PrimitiveType::Triangles);
   mesh->getMaterialGroup().set(renderMode, materialFull);
   mesh->getRenderState().setScissorTest(false);
 
@@ -152,4 +151,4 @@ gl::VertexLayout<SpriteVertex> SpriteVertex::getInstancedLayout()
     {VERTEX_ATTRIBUTE_NORMAL_NAME, &SpriteVertex::normal},
   };
 }
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/visitor.cpp b/src/render/scene/visitor.cpp
index 97a8e217b..364f85ffe 100644
--- a/src/render/scene/visitor.cpp
+++ b/src/render/scene/visitor.cpp
@@ -8,7 +8,7 @@
 #include <gl/debuggroup.h>
 #include <glm/geometric.hpp>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <optional>
 #include <utility>
@@ -32,7 +32,7 @@ void Visitor::visit(const Node& node)
   m_context->popState();
 }
 
-void Visitor::add(const gsl::not_null<const Node*>& node)
+void Visitor::add(const gsl_lite::not_null<const Node*>& node)
 {
   if(node->getRenderable() != nullptr)
     m_nodes.emplace_back(node, m_context->getCurrentState());
@@ -43,20 +43,19 @@ void Visitor::render(const std::optional<glm::vec3>& camera) const
   if(camera.has_value())
   {
     // logic: first order by render order, then order by distance to camera back-to-front
-    std::sort(m_nodes.begin(),
-              m_nodes.end(),
-              [this, camera](const RenderableInfo& a, const RenderableInfo& b)
-              {
-                if(auto aOrder = std::get<0>(a)->getRenderOrder(), bOrder = std::get<0>(b)->getRenderOrder();
-                   aOrder != bOrder)
-                {
-                  return aOrder < bOrder;
-                }
+    std::ranges::sort(m_nodes,
+                      [this, camera](const RenderableInfo& a, const RenderableInfo& b)
+                      {
+                        if(auto aOrder = std::get<0>(a)->getRenderOrder(), bOrder = std::get<0>(b)->getRenderOrder();
+                           aOrder != bOrder)
+                        {
+                          return aOrder < bOrder;
+                        }
 
-                auto da = glm::distance(std::get<0>(a)->getTranslationWorld(), *camera);
-                auto db = glm::distance(std::get<0>(b)->getTranslationWorld(), *camera);
-                return m_backToFront ? db > da : da > db;
-              });
+                        const auto da = glm::distance(std::get<0>(a)->getTranslationWorld(), *camera);
+                        const auto db = glm::distance(std::get<0>(b)->getTranslationWorld(), *camera);
+                        return m_backToFront ? db > da : da > db;
+                      });
   }
 
   for(const auto& [node, state] : m_nodes)
@@ -72,4 +71,4 @@ void Visitor::render(const std::optional<glm::vec3>& camera) const
 }
 
 Visitor::~Visitor() = default;
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/scene/visitor.h b/src/render/scene/visitor.h
index a03e97f37..5e10840c7 100644
--- a/src/render/scene/visitor.h
+++ b/src/render/scene/visitor.h
@@ -2,7 +2,7 @@
 
 #include <gl/renderstate.h>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <optional>
 #include <tuple>
 #include <vector>
@@ -15,7 +15,9 @@ class Node;
 class Visitor final
 {
 public:
-  explicit Visitor(const gsl::not_null<RenderContext*>& context, bool withScissors = true, bool backToFront = false)
+  explicit Visitor(const gsl_lite::not_null<RenderContext*>& context,
+                   const bool withScissors = true,
+                   const bool backToFront = false)
       : m_context{context}
       , m_withScissors{withScissors}
       , m_backToFront{backToFront}
@@ -31,6 +33,7 @@ class Visitor final
 
   void visit(const Node& node);
 
+  // ReSharper disable once CppMemberFunctionMayBeConst
   [[nodiscard]] RenderContext& getContext()
   {
     return *m_context;
@@ -41,15 +44,15 @@ class Visitor final
     return m_withScissors;
   }
 
-  void add(const gsl::not_null<const Node*>& node);
+  void add(const gsl_lite::not_null<const Node*>& node);
 
   void render(const std::optional<glm::vec3>& camera) const;
 
 private:
-  gsl::not_null<RenderContext*> m_context;
+  gsl_lite::not_null<RenderContext*> m_context;
   bool m_withScissors;
   bool m_backToFront;
-  using RenderableInfo = std::tuple<gsl::not_null<const Node*>, gl::RenderState>;
+  using RenderableInfo = std::tuple<gsl_lite::not_null<const Node*>, gl::RenderState>;
   mutable std::vector<RenderableInfo> m_nodes;
 };
-} // namespace render::scene
+} // namespace render::scene
\ No newline at end of file
diff --git a/src/render/textureanimator.cpp b/src/render/textureanimator.cpp
index 51b0498b8..d67c1587e 100644
--- a/src/render/textureanimator.cpp
+++ b/src/render/textureanimator.cpp
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <gl/buffer.h>
 #include <gl/vertexbuffer.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <utility>
 #include <vector>
 
@@ -62,4 +62,4 @@ void TextureAnimator::Sequence::updateCoordinates(gl::VertexBuffer<AnimatedUV>&
 
   uvArray.flush();
 }
-} // namespace render
+} // namespace render
\ No newline at end of file
diff --git a/src/render/textureanimator.h b/src/render/textureanimator.h
index 691d97d5d..da2d571ae 100644
--- a/src/render/textureanimator.h
+++ b/src/render/textureanimator.h
@@ -11,7 +11,7 @@
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <map>
 #include <set>
@@ -31,7 +31,8 @@ struct AnimatedUV
   glm::vec4 quadUv34{};
 
   explicit AnimatedUV() = default;
-  explicit AnimatedUV(glm::int32 index, const glm::vec2& uv, const glm::vec4& quadUv12, const glm::vec4& quadUv34)
+
+  explicit AnimatedUV(const glm::int32 index, const glm::vec2& uv, const glm::vec4& quadUv12, const glm::vec4& quadUv34)
       : uv{uv, index}
       , quadUv12{quadUv12}
       , quadUv34{quadUv34}
@@ -46,7 +47,7 @@ class TextureAnimator
 
   void registerVertex(const core::TextureTileId& tileId, const int sourceIndex, const size_t bufferIndex)
   {
-    auto it = m_sequenceByTileId.find(tileId);
+    const auto it = m_sequenceByTileId.find(tileId);
     if(it == m_sequenceByTileId.end())
       return;
 
@@ -109,12 +110,12 @@ class TextureAnimator
     void rotate()
     {
       BOOST_ASSERT(!tileIds.empty());
-      std::rotate(tileIds.begin(), std::next(tileIds.begin()), tileIds.end());
+      std::ranges::rotate(tileIds, std::next(tileIds.begin()));
     }
 
     void registerVertex(VertexReference vertex, const core::TextureTileId& tileId)
     {
-      const auto it = std::find(tileIds.begin(), tileIds.end(), tileId);
+      const auto it = std::ranges::find(tileIds, tileId);
       gsl_Assert(it != tileIds.end());
       vertex.queueOffset = std::distance(tileIds.begin(), it);
       affectedVertices.insert(vertex);
@@ -126,4 +127,4 @@ class TextureAnimator
   std::vector<Sequence> m_sequences;
   std::map<core::TextureTileId, size_t> m_sequenceByTileId;
 };
-} // namespace render
+} // namespace render
\ No newline at end of file
diff --git a/src/render/textureatlas.h b/src/render/textureatlas.h
index f5d4b91d4..46c7985ca 100644
--- a/src/render/textureatlas.h
+++ b/src/render/textureatlas.h
@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <gl/cimgwrapper.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <memory>
 #include <optional>
@@ -15,10 +15,10 @@
 namespace render
 {
 /**
- * @brief A Binary Space Partition Tree for 2D space.
- *
- * Based on https://blackpawn.com/texts/lightmaps/default.html.
- */
+* @brief A Binary Space Partition Tree for 2D space.
+*
+* Based on https://blackpawn.com/texts/lightmaps/default.html.
+*/
 #ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable : 4324)
@@ -69,9 +69,9 @@ struct alignas(64) BSPTree final
   }
 
   /**
-     * @brief Split this node along its Y axis (X is split).
-     * @param splitLocation Local X coordinate of the split point
-     */
+* @brief Split this node along its Y axis (X is split).
+* @param splitLocation Local X coordinate of the split point
+*/
   void splitX(const int32_t splitLocation)
   {
     gsl_Expects(splitLocation < width);
@@ -80,9 +80,9 @@ struct alignas(64) BSPTree final
   }
 
   /**
-     * @brief Split this node along its X axis (Y is split).
-     * @param splitLocation Local Y coordinate of the split point
-     */
+* @brief Split this node along its X axis (Y is split).
+* @param splitLocation Local Y coordinate of the split point
+*/
   void splitY(const int32_t splitLocation)
   {
     gsl_Expects(splitLocation < height);
@@ -99,8 +99,8 @@ struct alignas(64) BSPTree final
   }
 
   /**
-     * @brief Find a free space in this node or its children
-     */
+* @brief Find a free space in this node or its children
+*/
   // NOLINTNEXTLINE(misc-no-recursion)
   std::optional<glm::ivec2> tryInsert(const int32_t insWidth, const int32_t insHeight)
   {
@@ -152,8 +152,7 @@ struct alignas(64) BSPTree final
     else
     {
       const auto dw = width - insWidth;
-      const auto dh = height - insHeight;
-      if(dw > dh)
+      if(const auto dh = height - insHeight; dw > dh)
       {
         splitX(insWidth);
       }
@@ -177,7 +176,7 @@ class TextureAtlas final
   std::shared_ptr<gl::CImgWrapper> m_image;
 
 public:
-  explicit TextureAtlas(const int32_t pageSize, bool onlyLayout)
+  explicit TextureAtlas(const int32_t pageSize, const bool onlyLayout)
       : m_layout{0, 0, pageSize, pageSize}
       , m_image{onlyLayout ? nullptr : std::make_shared<gl::CImgWrapper>(pageSize)}
   {
@@ -194,7 +193,7 @@ class TextureAtlas final
   std::optional<glm::ivec2> put(gl::CImgWrapper& img)
   {
     gsl_Assert(m_image != nullptr);
-    auto dstArea = m_layout.tryInsert(img.width(), img.height());
+    const auto dstArea = m_layout.tryInsert(img.width(), img.height());
     if(!dstArea.has_value())
       return std::nullopt;
 
@@ -230,7 +229,7 @@ class MultiTextureAtlas final
 public:
   static constexpr int BoundaryMargin = 16;
 
-  explicit MultiTextureAtlas(const int32_t pageSize, bool onlyLayout)
+  explicit MultiTextureAtlas(const int32_t pageSize, const bool onlyLayout)
       : m_pageSize{pageSize}
       , m_onlyLayout{onlyLayout}
   {
@@ -254,7 +253,7 @@ class MultiTextureAtlas final
         return {i, *position + glm::ivec2{BoundaryMargin, BoundaryMargin}};
 
     m_atlases.emplace_back(m_pageSize, m_onlyLayout);
-    auto position = m_atlases.back().put(extended);
+    const auto position = m_atlases.back().put(extended);
     gsl_Assert(position.has_value());
     // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
     return {m_atlases.size() - 1, *position + glm::ivec2{BoundaryMargin, BoundaryMargin}};
@@ -269,7 +268,7 @@ class MultiTextureAtlas final
         return {i, *position + glm::ivec2{BoundaryMargin, BoundaryMargin}};
 
     m_atlases.emplace_back(m_pageSize, m_onlyLayout);
-    auto position = m_atlases.back().put(size + 2 * glm::ivec2{BoundaryMargin, BoundaryMargin});
+    const auto position = m_atlases.back().put(size + 2 * glm::ivec2{BoundaryMargin, BoundaryMargin});
     gsl_Assert(position.has_value());
     // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
     return {m_atlases.size() - 1, *position + glm::ivec2{BoundaryMargin, BoundaryMargin}};
@@ -281,13 +280,12 @@ class MultiTextureAtlas final
 
     std::vector<std::shared_ptr<gl::CImgWrapper>> result;
     result.reserve(m_atlases.size());
-    std::transform(m_atlases.begin(),
-                   m_atlases.end(),
-                   std::back_inserter(result),
-                   [](auto& atlas)
-                   {
-                     return atlas.takeImage();
-                   });
+    std::ranges::transform(m_atlases,
+                           std::back_inserter(result),
+                           [](auto& atlas)
+                           {
+                             return atlas.takeImage();
+                           });
     return result;
   }
 
@@ -301,4 +299,4 @@ class MultiTextureAtlas final
     return m_atlases.size();
   }
 };
-} // namespace render
+} // namespace render
\ No newline at end of file
diff --git a/src/serialization/CMakeLists.txt b/src/serialization/CMakeLists.txt
new file mode 100644
index 000000000..ea6c6ead1
--- /dev/null
+++ b/src/serialization/CMakeLists.txt
@@ -0,0 +1,10 @@
+include( boost_test )
+add_boost_test( serialization_test
+        tests/test_main.cpp
+        tests/test_basic.cpp
+        tests/test_containers.cpp
+        tests/test_math.cpp
+        tests/test_misc.cpp
+        tests/test_ptr.cpp
+)
+target_link_libraries( serialization_test PRIVATE serialization soglb )
diff --git a/src/serialization/access.h b/src/serialization/access.h
index c9dbdf7b4..d4c26db6a 100644
--- a/src/serialization/access.h
+++ b/src/serialization/access.h
@@ -1,65 +1,33 @@
 #pragma once
 
-#include "serialization_fwd.h"
+#include "concepts.h"
 
-namespace serialization
+namespace serialization::access
 {
-template<typename T, bool Loading>
-struct access;
-
-template<typename T>
-struct access<T, false>
+template<typename T, typename TContext>
+requires Serializable<T, TContext> void dispatchSerialize(const T& data, const Serializer<TContext>& ser)
 {
-  template<typename TContext, typename T2>
-  static auto dispatch(const T2& data, const Serializer<TContext>& ser) -> decltype(data.serialize(ser), void())
-  {
-    static_assert(
-      std::is_same_v<std::remove_cv_t<std::remove_reference_t<T>>, std::remove_cv_t<std::remove_reference_t<T2>>>);
-    return data.serialize(ser);
-  }
-
-  template<typename TContext, typename T2>
-  static auto dispatch(const T2& data, const Serializer<TContext>& ser) -> decltype(serialize(data, ser), void())
-  {
-    static_assert(
-      std::is_same_v<std::remove_cv_t<std::remove_reference_t<T>>, std::remove_cv_t<std::remove_reference_t<T2>>>);
-    return serialize(data, ser);
-  }
-};
-
-template<typename T>
-struct access<T, true>
+  if constexpr(MemberSerializable<T, TContext>)
+    data.serialize(ser);
+  else
+    serialize(data, ser);
+}
+
+template<typename T, typename TContext>
+requires Deserializable<T, TContext> void dispatchDeserialize(T& data, const Deserializer<TContext>& ser)
 {
-  template<typename TContext, typename T2>
-  static auto dispatch(T2& data, const Deserializer<TContext>& ser) -> decltype(data.deserialize(ser), void())
-  {
-    static_assert(
-      std::is_same_v<std::remove_cv_t<std::remove_reference_t<T>>, std::remove_cv_t<std::remove_reference_t<T2>>>);
-    return data.deserialize(ser);
-  }
-
-  template<typename TContext, typename T2>
-  static auto dispatch(T2& data, const Deserializer<TContext>& ser) -> decltype(deserialize(data, ser), void())
-  {
-    static_assert(
-      std::is_same_v<std::remove_cv_t<std::remove_reference_t<T>>, std::remove_cv_t<std::remove_reference_t<T2>>>);
-    return deserialize(data, ser);
-  }
-
-  template<typename TContext, typename T2 = T>
-  static auto dispatch(const Deserializer<TContext>& ser) -> decltype(T2::create(ser))
-  {
-    static_assert(
-      std::is_same_v<std::remove_cv_t<std::remove_reference_t<T>>, std::remove_cv_t<std::remove_reference_t<T2>>>);
+  if constexpr(MemberDeserializable<T, TContext>)
+    data.deserialize(ser);
+  else
+    deserialize(data, ser);
+}
+
+template<typename T, typename TContext>
+requires Creatable<T, TContext> T dispatchCreate(const Deserializer<TContext>& ser)
+{
+  if constexpr(MemberCreatable<T, TContext>)
     return T::create(ser);
-  }
-
-  template<typename TContext, typename T2 = T>
-  static auto dispatch(const Deserializer<TContext>& ser) -> decltype(create(TypeId<T2>{}, ser))
-  {
-    static_assert(
-      std::is_same_v<std::remove_cv_t<std::remove_reference_t<T>>, std::remove_cv_t<std::remove_reference_t<T2>>>);
+  else
     return create(TypeId<T>{}, ser);
-  }
-};
-} // namespace serialization
+}
+} // namespace serialization::access
diff --git a/src/serialization/array.h b/src/serialization/array.h
index 9a62ccdcb..593bb85ea 100644
--- a/src/serialization/array.h
+++ b/src/serialization/array.h
@@ -4,7 +4,7 @@
 
 #include <array>
 #include <cstddef>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace serialization
 {
@@ -16,7 +16,7 @@ void serialize(const std::array<T, N>& data, const Serializer<TContext>& ser)
   for(typename std::array<T, N>::size_type i = 0; i < N; ++i)
   {
     const auto tmp = ser.newChild();
-    access<T, false>::dispatch(data[i], tmp);
+    access::dispatchSerialize(data[i], tmp);
   }
 }
 
@@ -28,7 +28,7 @@ void deserialize(std::array<T, N>& data, const Deserializer<TContext>& ser)
   gsl_Expects(ser.node.num_children() == N);
   for(typename std::array<T, N>::size_type i = 0; i < N; ++i)
   {
-    access<T, true>::dispatch(data[i], ser.withNode(ser.node[i]));
+    access::dispatchDeserialize(data[i], ser.withNode(ser.node[i]));
   }
 }
 } // namespace serialization
diff --git a/src/serialization/bitset.h b/src/serialization/bitset.h
index 8026975b2..3c5008ecb 100644
--- a/src/serialization/bitset.h
+++ b/src/serialization/bitset.h
@@ -4,6 +4,9 @@
 
 #include <bitset>
 #include <cstddef>
+#include <gsl-lite/gsl-lite.hpp>
+#include <ryml.hpp>
+#include <string>
 
 namespace serialization
 {
@@ -35,4 +38,4 @@ void deserialize(std::bitset<N>& data, const Deserializer<TContext>& ser)
       data.set(i);
   }
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/box_ptr.h b/src/serialization/box_ptr.h
index 8dbbf0ba8..970da8ee2 100644
--- a/src/serialization/box_ptr.h
+++ b/src/serialization/box_ptr.h
@@ -5,7 +5,7 @@
 #include "serialization.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <optional>
 
@@ -17,7 +17,7 @@ inline std::optional<uint32_t> ptrSave(const engine::world::Box* box, const Seri
     return std::nullopt;
 
   ser.tag("box");
-  return gsl::narrow<uint32_t>(std::distance(&ser.context->getBoxes().at(0), box));
+  return gsl_lite::narrow<uint32_t>(std::distance(&ser.context->getBoxes().at(0), box));
 }
 
 inline std::optional<uint32_t> ptrSave(engine::world::Box* box, const Serializer<engine::world::World>& ser)
@@ -26,7 +26,7 @@ inline std::optional<uint32_t> ptrSave(engine::world::Box* box, const Serializer
 }
 
 inline const engine::world::Box* ptrLoad(const TypeId<const engine::world::Box*>&,
-                                         std::optional<uint32_t> idx,
+                                         const std::optional<uint32_t> idx,
                                          const Deserializer<engine::world::World>& ser)
 {
   if(!idx.has_value())
@@ -37,7 +37,7 @@ inline const engine::world::Box* ptrLoad(const TypeId<const engine::world::Box*>
 }
 
 inline engine::world::Box* ptrLoad(const TypeId<engine::world::Box*>&,
-                                   std::optional<uint32_t> idx,
+                                   const std::optional<uint32_t> idx,
                                    const Deserializer<engine::world::World>& ser)
 {
   return const_cast<engine::world::Box*>(ptrLoad(TypeId<const engine::world::Box*>{}, idx, ser));
diff --git a/src/serialization/chrono.h b/src/serialization/chrono.h
index 31c74f004..e63b705f0 100644
--- a/src/serialization/chrono.h
+++ b/src/serialization/chrono.h
@@ -34,4 +34,4 @@ std::chrono::duration<Rep, Period> create(const TypeId<std::chrono::duration<Rep
   deserialize(tmp, ser);
   return tmp;
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/concepts.h b/src/serialization/concepts.h
new file mode 100644
index 000000000..ae3a90144
--- /dev/null
+++ b/src/serialization/concepts.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include <concepts>
+
+namespace serialization
+{
+template<typename T>
+struct TypeId;
+
+template<bool Loading, typename TContext>
+class BaseSerializer;
+
+template<typename TContext>
+using Serializer = BaseSerializer<false, TContext>;
+template<typename TContext>
+using Deserializer = BaseSerializer<true, TContext>;
+
+template<typename T, typename TContext>
+concept MemberSerializable = requires(const T& data, const Serializer<TContext>& ser)
+{
+  data.serialize(ser);
+};
+
+template<typename T, typename TContext>
+concept NonMemberSerializable = requires(const T& data, const Serializer<TContext>& ser)
+{
+  serialize(data, ser);
+};
+
+template<typename T, typename TContext>
+concept Serializable = MemberSerializable<T, TContext> || NonMemberSerializable<T, TContext>;
+
+template<typename T, typename TContext>
+concept MemberDeserializable = requires(T & data, const Deserializer<TContext>& ser)
+{
+  data.deserialize(ser);
+};
+
+template<typename T, typename TContext>
+concept NonMemberDeserializable = requires(T & data, const Deserializer<TContext>& ser)
+{
+  deserialize(data, ser);
+};
+
+template<typename T, typename TContext>
+concept Deserializable = MemberDeserializable<T, TContext> || NonMemberDeserializable<T, TContext>;
+
+template<typename T, typename TContext>
+concept MemberCreatable = requires(const Deserializer<TContext>& ser)
+{
+  T::create(ser);
+};
+
+template<typename T, typename TContext>
+concept NonMemberCreatable = requires(const Deserializer<TContext>& ser)
+{
+  create(TypeId<T>{}, ser);
+};
+
+template<typename T, typename TContext>
+concept Creatable = MemberCreatable<T, TContext> || NonMemberCreatable<T, TContext>;
+
+} // namespace serialization
diff --git a/src/serialization/default.h b/src/serialization/default.h
index 33abf502b..1995e5ff3 100644
--- a/src/serialization/default.h
+++ b/src/serialization/default.h
@@ -7,13 +7,14 @@ namespace serialization
 template<typename T>
 struct Default
 {
-  Default(const Default<T>&) = delete;
-  Default(Default<T>&&) = delete;
-  void operator=(Default<T>&&) = delete;
-  void operator=(const Default<T>&) = delete;
+  Default(const Default&) = delete;
+  Default(Default&&) = delete;
+  void operator=(Default&&) = delete;
+  void operator=(const Default&) = delete;
 
   std::reference_wrapper<T> value;
   T defaultValue;
+
   explicit Default(std::reference_wrapper<T>&& value, const T& defaultValue)
       : value{std::move(value)}
       , defaultValue{defaultValue}
@@ -26,5 +27,4 @@ struct Default
   {                               \
     obj, default                  \
   }
-
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/deque.h b/src/serialization/deque.h
index 6d486b56f..882502675 100644
--- a/src/serialization/deque.h
+++ b/src/serialization/deque.h
@@ -4,7 +4,7 @@
 #include "serialization.h"
 
 #include <deque>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace serialization
 {
@@ -16,7 +16,7 @@ void serialize(const std::deque<T>& data, const Serializer<TContext>& ser)
   for(auto& element : data)
   {
     const auto tmp = ser.newChild();
-    access<T, false>::dispatch(element, tmp);
+    access::dispatchSerialize(element, tmp);
   }
 }
 
@@ -31,7 +31,7 @@ void deserialize(std::deque<T>& data, const Deserializer<TContext>& ser)
                  std::back_inserter(data),
                  [&ser](const ryml::ConstNodeRef& element)
                  {
-                   return T{access<T, true>::dispatch(ser.withNode(element))};
+                   return access::dispatchCreate<T>(ser.withNode(element));
                  });
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/exception.h b/src/serialization/exception.h
index 0c54102c7..99bf3f544 100644
--- a/src/serialization/exception.h
+++ b/src/serialization/exception.h
@@ -13,4 +13,4 @@ class Exception : public std::runtime_error
 };
 
 #define SERIALIZER_EXCEPTION(...) BOOST_THROW_EXCEPTION(::serialization::Exception(__VA_ARGS__))
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/gl_pixel.h b/src/serialization/gl_pixel.h
index c001ef0e4..48aba8ba8 100644
--- a/src/serialization/gl_pixel.h
+++ b/src/serialization/gl_pixel.h
@@ -5,8 +5,8 @@
 #include <cstddef>
 #include <gl/api/gl.hpp>
 #include <gl/pixel.h>
-#include <glm/glm_fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <glm/fwd.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace serialization
 {
@@ -25,7 +25,7 @@ void serialize(gl::Pixel<T, Channels, PixelFormat, SizedInternalFormat, Premulti
   for(glm::length_t i = 0; i < Channels; ++i)
   {
     const auto tmp = ser.newChild();
-    access<T, false>::dispatch(data.channels[i], tmp);
+    access::dispatchSerialize(data.channels[i], tmp);
   }
 }
 
@@ -44,7 +44,7 @@ void deserialize(gl::Pixel<T, Channels, PixelFormat, SizedInternalFormat, Premul
   gsl_Expects(ser.node.num_children() == Channels);
   for(glm::length_t i = 0; i < Channels; ++i)
   {
-    access<T, true>::dispatch(data.channels[i], ser.withNode(ser.node[i]));
+    access::dispatchDeserialize(data.channels[i], ser.withNode(ser.node[i]));
   }
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/glm.h b/src/serialization/glm.h
index fb13bbae6..7a06bb638 100644
--- a/src/serialization/glm.h
+++ b/src/serialization/glm.h
@@ -3,12 +3,13 @@
 #include "serialization_fwd.h"
 
 #include <glm/glm.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ryml.hpp>
 
 namespace serialization
 {
 template<typename TContext>
-inline void serialize(const glm::mat4& m, const Serializer<TContext>& ser)
+void serialize(const glm::mat4& m, const Serializer<TContext>& ser)
 {
   ser.tag("mat4");
   ser.node |= ryml::SEQ;
@@ -18,7 +19,7 @@ inline void serialize(const glm::mat4& m, const Serializer<TContext>& ser)
 }
 
 template<typename TContext>
-inline void deserialize(glm::mat4& m, const Deserializer<TContext>& ser)
+void deserialize(glm::mat4& m, const Deserializer<TContext>& ser)
 {
   ser.tag("mat4");
   gsl_Expects(ser.node.is_seq() && ser.node.num_children() == 4 * 4);
@@ -34,7 +35,7 @@ inline void deserialize(glm::mat4& m, const Deserializer<TContext>& ser)
 }
 
 template<typename TContext>
-inline glm::mat4 create(const TypeId<glm::mat4>&, const Deserializer<TContext>& ser)
+glm::mat4 create(const TypeId<glm::mat4>&, const Deserializer<TContext>& ser)
 {
   ser.tag("mat4");
   glm::mat4 m{};
@@ -43,7 +44,7 @@ inline glm::mat4 create(const TypeId<glm::mat4>&, const Deserializer<TContext>&
 }
 
 template<typename TContext, glm::length_t L, typename T, glm::qualifier Q>
-inline void serialize(const glm::vec<L, T, Q>& v, const Serializer<TContext>& ser)
+void serialize(const glm::vec<L, T, Q>& v, const Serializer<TContext>& ser)
 {
   ser.tag("vec");
   ser.node |= ryml::SEQ;
@@ -52,7 +53,7 @@ inline void serialize(const glm::vec<L, T, Q>& v, const Serializer<TContext>& se
 }
 
 template<typename TContext, glm::length_t L, typename T, glm::qualifier Q>
-inline void deserialize(glm::vec<L, T, Q>& v, const Deserializer<TContext>& ser)
+void deserialize(glm::vec<L, T, Q>& v, const Deserializer<TContext>& ser)
 {
   ser.tag("vec");
   gsl_Expects(ser.node.is_seq() && ser.node.num_children() == L);
@@ -65,11 +66,11 @@ inline void deserialize(glm::vec<L, T, Q>& v, const Deserializer<TContext>& ser)
 }
 
 template<typename TContext, glm::length_t L, typename T, glm::qualifier Q>
-inline glm::vec<L, T, Q> create(const TypeId<glm::vec<L, T, Q>>&, const Deserializer<TContext>& ser)
+glm::vec<L, T, Q> create(const TypeId<glm::vec<L, T, Q>>&, const Deserializer<TContext>& ser)
 {
   ser.tag("vec");
   glm::vec<L, T, Q> v{};
   deserialize(v, ser);
   return v;
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/map.h b/src/serialization/map.h
index 311fd65a2..57da22b9c 100644
--- a/src/serialization/map.h
+++ b/src/serialization/map.h
@@ -3,7 +3,7 @@
 #include "access.h"
 #include "serialization.h" // IWYU pragma: keep
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <map>
 
 namespace serialization
@@ -16,8 +16,8 @@ void serialize(const std::map<T, U>& data, const Serializer<TContext>& ser)
   for(auto& [key, value] : data)
   {
     const auto tmp = ser.newChild();
-    access<T, false>::dispatch(key, tmp["key"]);
-    access<U, false>::dispatch(value, tmp["value"]);
+    access::dispatchSerialize(key, tmp["key"]);
+    access::dispatchSerialize(value, tmp["value"]);
   }
 }
 
@@ -32,8 +32,8 @@ void deserialize(std::map<T, U>& data, const Deserializer<TContext>& ser)
     gsl_Assert(element.num_children() == 2);
     gsl_Assert(element["key"].readable() && element["value"].readable());
 
-    data.emplace(access<T, true>::dispatch(ser.withNode(element["key"])),
-                 access<U, true>::dispatch(ser.withNode(element["value"])));
+    data.emplace(access::dispatchCreate<T>(ser.withNode(element["key"])),
+                 access::dispatchCreate<U>(ser.withNode(element["value"])));
   }
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/named_enum.h b/src/serialization/named_enum.h
index aa5f847c5..3a83eb6cb 100644
--- a/src/serialization/named_enum.h
+++ b/src/serialization/named_enum.h
@@ -37,9 +37,9 @@ struct NamedEnum
   }
 
   template<typename TContext>
-  static NamedEnum<T, Converter> create(const Deserializer<TContext>& ser)
+  static NamedEnum create(const Deserializer<TContext>& ser)
   {
-    NamedEnum<T, Converter> result{};
+    NamedEnum result{};
     result.deserialize(ser);
     return result;
   }
@@ -57,10 +57,10 @@ struct NamedEnum
     return value;
   }
 
-  NamedEnum<T, Converter>& operator=(T e)
+  NamedEnum& operator=(T e)
   {
     value = e;
     return *this;
   }
 };
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/not_null.h b/src/serialization/not_null.h
index 9d5166c94..779b64dee 100644
--- a/src/serialization/not_null.h
+++ b/src/serialization/not_null.h
@@ -3,28 +3,28 @@
 #include "access.h"
 #include "serialization.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <type_traits>
 
 namespace serialization
 {
 template<typename T, typename TContext>
-auto create(const TypeId<gsl::not_null<T>>&, const Deserializer<TContext>& ser)
-  -> std::remove_reference_t<decltype(access<T, true>::dispatch(ser), std::declval<gsl::not_null<T>>())>
+auto create(const TypeId<gsl_lite::not_null<T>>&, const Deserializer<TContext>& ser)
+  -> std::remove_reference_t<decltype(access::dispatchCreate<T>(ser), std::declval<gsl_lite::not_null<T>>())>
 {
-  return gsl::not_null<T>{access<T, true>::dispatch(ser)};
+  return gsl_lite::not_null<T>{access::dispatchCreate<T>(ser)};
 }
 
 template<typename T, typename TContext>
-void serialize(const gsl::not_null<T>& data, const Serializer<TContext>& ser)
+void serialize(const gsl_lite::not_null<T>& data, const Serializer<TContext>& ser)
 {
   auto tmp = data.get();
-  access<decltype(tmp), false>::dispatch(tmp, ser);
+  access::dispatchSerialize(tmp, ser);
 }
 
 template<typename T, typename TContext>
-void deserialize(gsl::not_null<T>& data, const Deserializer<TContext>& ser)
+void deserialize(gsl_lite::not_null<T>& data, const Deserializer<TContext>& ser)
 {
-  data = create(TypeId<gsl::not_null<T>>{}, ser);
+  data = create(TypeId<gsl_lite::not_null<T>>{}, ser);
 }
 } // namespace serialization
diff --git a/src/serialization/objectreference.h b/src/serialization/objectreference.h
index d79562926..f7b3c58fa 100644
--- a/src/serialization/objectreference.h
+++ b/src/serialization/objectreference.h
@@ -4,22 +4,22 @@
 #include "engine/world/world.h"
 #include "serialization.h"
 
+#include <concepts>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace serialization
 {
-template<typename T>
+template<std::derived_from<engine::objects::Object> T>
 struct ObjectReference final
 {
-  ObjectReference(const ObjectReference<T>&) = delete;
-  ObjectReference(ObjectReference<T>&&) = delete;
+  ObjectReference(const ObjectReference&) = delete;
+  ObjectReference(ObjectReference&&) = delete;
   ~ObjectReference() = default;
-  void operator=(ObjectReference<T>&&) = delete;
-  void operator=(const ObjectReference<T>&) = delete;
+  void operator=(ObjectReference&&) = delete;
+  void operator=(const ObjectReference&) = delete;
 
-  static_assert(std::is_base_of_v<engine::objects::Object, T>);
   std::reference_wrapper<std::shared_ptr<T>> ptr;
 
   explicit ObjectReference(const std::reference_wrapper<const std::shared_ptr<T>>& ptr)
@@ -37,23 +37,22 @@ struct ObjectReference final
     if(ptr.get() == nullptr)
     {
       ser.setNull();
+      return;
     }
-    else
+
+    ser.tag("objectref");
+    for(const auto& [objId, obj] : ser.context->getObjectManager().getObjects())
     {
-      ser.tag("objectref");
-      for(const auto& [objId, obj] : ser.context->getObjectManager().getObjects())
+      if(obj.get() == ptr.get())
       {
-        if(obj.get() == ptr.get())
-        {
-          engine::ObjectId tmp = objId;
-          ser(S_NV("id", tmp));
-          return;
-        }
+        engine::ObjectId tmp = objId;
+        ser(S_NV("id", tmp));
+        return;
       }
-
-      // this may happen if the object was killed, thus rendering this reference invalid
-      ser.setNull();
     }
+
+    // this may happen if the object was killed, thus rendering this reference invalid
+    ser.setNull();
   }
 
   void deserialize(const Deserializer<engine::world::World>& ser)
@@ -61,19 +60,18 @@ struct ObjectReference final
     if(ser.isNull())
     {
       ptr.get() = nullptr;
+      return;
     }
-    else
+
+    ser << [ptr = ptr](const Deserializer<engine::world::World>& ser)
     {
-      ser << [ptr = ptr](const Deserializer<engine::world::World>& ser)
-      {
-        ser.tag("objectref");
-        engine::ObjectId id = 0;
-        ser(S_NV("id", id));
-        auto tmp = ser.context->getObjectManager().getObjects().at(id).get();
-        gsl_Assert(tmp != nullptr);
-        ptr.get() = std::dynamic_pointer_cast<T>(tmp);
-      };
-    }
+      ser.tag("objectref");
+      engine::ObjectId id = 0;
+      ser(S_NV("id", id));
+      const auto tmp = ser.context->getObjectManager().getObjects().at(id).get();
+      gsl_Assert(tmp != nullptr);
+      ptr.get() = std::dynamic_pointer_cast<T>(tmp);
+    };
   }
 };
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/optional.h b/src/serialization/optional.h
index 17943149e..17283fe50 100644
--- a/src/serialization/optional.h
+++ b/src/serialization/optional.h
@@ -8,11 +8,11 @@
 namespace serialization
 {
 template<typename T, typename TContext>
-inline void serialize(const std::optional<T>& optional, const Serializer<TContext>& ser)
+void serialize(const std::optional<T>& optional, const Serializer<TContext>& ser)
 {
   if(optional.has_value())
   {
-    access<T, false>::dispatch(*optional, ser);
+    access::dispatchSerialize(*optional, ser);
   }
   else
   {
@@ -21,7 +21,7 @@ inline void serialize(const std::optional<T>& optional, const Serializer<TContex
 }
 
 template<typename T, typename TContext>
-inline void deserialize(std::optional<T>& optional, const Deserializer<TContext>& ser)
+void deserialize(std::optional<T>& optional, const Deserializer<TContext>& ser)
 {
   if(ser.isNull())
   {
@@ -30,14 +30,14 @@ inline void deserialize(std::optional<T>& optional, const Deserializer<TContext>
   else
   {
     if(optional.has_value())
-      access<T, true>::dispatch(*optional, ser);
+      access::dispatchDeserialize(*optional, ser);
     else
-      optional = access<T, true>::dispatch(ser);
+      optional = access::dispatchCreate<T>(ser);
   }
 }
 
 template<typename T, typename TContext>
-inline std::optional<T> create(const TypeId<std::optional<T>>&, const Deserializer<TContext>& ser)
+std::optional<T> create(const TypeId<std::optional<T>>&, const Deserializer<TContext>& ser)
 {
   if(ser.isNull())
   {
@@ -45,7 +45,7 @@ inline std::optional<T> create(const TypeId<std::optional<T>>&, const Deserializ
   }
   else
   {
-    return access<T, true>::dispatch(ser);
+    return access::dispatchCreate<T>(ser);
   }
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/optional_value.h b/src/serialization/optional_value.h
index b71f712b5..f05b3e51a 100644
--- a/src/serialization/optional_value.h
+++ b/src/serialization/optional_value.h
@@ -7,12 +7,13 @@ namespace serialization
 template<typename T>
 struct OptionalValue final
 {
-  OptionalValue(const OptionalValue<T>&) = delete;
-  OptionalValue(OptionalValue<T>&&) = delete;
-  void operator=(OptionalValue<T>&&) = delete;
-  void operator=(const OptionalValue<T>&) = delete;
+  OptionalValue(const OptionalValue&) = delete;
+  OptionalValue(OptionalValue&&) = delete;
+  void operator=(OptionalValue&&) = delete;
+  void operator=(const OptionalValue&) = delete;
 
   std::reference_wrapper<T> value;
+
   explicit OptionalValue(std::reference_wrapper<T>&& value)
       : value{std::move(value)}
   {
@@ -24,5 +25,4 @@ struct OptionalValue final
   {                                  \
     obj                              \
   }
-
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/pair.h b/src/serialization/pair.h
index efb581735..9829de384 100644
--- a/src/serialization/pair.h
+++ b/src/serialization/pair.h
@@ -15,10 +15,16 @@ void serialize(const std::pair<T, U>& data, const Serializer<TContext>& ser)
 }
 
 template<typename T, typename U, typename TContext>
-inline std::pair<T, U> create(const TypeId<std::pair<T, U>>&, const Deserializer<TContext>& ser)
+std::pair<T, U> create(const TypeId<std::pair<T, U>>&, const Deserializer<TContext>& ser)
 {
   ser.tag("pair");
-  return {access<T, true>::dispatch(ser.withNode(ser.node["first"])),
-          access<U, true>::dispatch(ser.withNode(ser.node["second"]))};
+  return {access::dispatchCreate<T>(ser.withNode(ser.node["first"])),
+          access::dispatchCreate<U>(ser.withNode(ser.node["second"]))};
 }
-} // namespace serialization
+
+template<typename T, typename U, typename TContext>
+void deserialize(std::pair<T, U>& data, const Deserializer<TContext>& ser)
+{
+  data = create(TypeId<std::pair<T, U>>{}, ser);
+}
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/path.h b/src/serialization/path.h
index 61ece9d78..155ce7c96 100644
--- a/src/serialization/path.h
+++ b/src/serialization/path.h
@@ -12,7 +12,7 @@ void serialize(const std::filesystem::path& data, const Serializer<TContext>& se
 {
   ser.tag("path");
   auto tmp = data.string();
-  access<std::string, false>::dispatch(tmp, ser);
+  access::dispatchSerialize(tmp, ser);
 }
 
 template<typename TContext>
@@ -20,7 +20,7 @@ void deserialize(std::filesystem::path& data, const Deserializer<TContext>& ser)
 {
   ser.tag("path");
   std::string tmp;
-  access<std::string, true>::dispatch(tmp, ser);
+  access::dispatchDeserialize(tmp, ser);
   data = std::filesystem::path{tmp};
 }
 
@@ -31,4 +31,4 @@ std::filesystem::path create(const TypeId<std::filesystem::path>&, const Deseria
   deserialize(tmp, ser);
   return tmp;
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/ptr.h b/src/serialization/ptr.h
index fdeccc10a..c65663648 100644
--- a/src/serialization/ptr.h
+++ b/src/serialization/ptr.h
@@ -3,7 +3,7 @@
 #include "access.h"
 #include "serialization.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace serialization
 {
@@ -11,7 +11,8 @@ template<typename T, typename TContext>
 auto serialize(T* const& data, const Serializer<TContext>& ser) -> decltype(ptrSave(data, ser), void())
 {
   auto tmp = ptrSave(data, ser);
-  access<decltype(tmp), false>::dispatch(tmp, ser);
+  access::dispatchSerialize(tmp, ser);
+  return;
 }
 
 template<typename T, typename TContext>
@@ -21,7 +22,8 @@ auto deserialize(T*& data, const Deserializer<TContext>& ser)
               void())
 {
   using IdxType = decltype(ptrSave(data, std::declval<Serializer<TContext>>()));
-  data = ptrLoad(TypeId<T*>{}, access<IdxType, true>::dispatch(ser), ser);
+  data = ptrLoad(TypeId<T*>{}, access::dispatchCreate<IdxType>(ser), ser);
+  return;
 }
 
 template<typename T, typename TContext>
@@ -31,13 +33,13 @@ auto create(const TypeId<T*>&, const Deserializer<TContext>& ser)
               static_cast<T*>(nullptr))
 {
   using IdxType = decltype(ptrSave(std::declval<T*>(), std::declval<Serializer<TContext>>()));
-  return ptrLoad(TypeId<T*>{}, access<IdxType, true>::dispatch(ser), ser);
+  return ptrLoad(TypeId<T*>{}, access::dispatchCreate<IdxType>(ser), ser);
 }
 
 template<typename T, typename TContext>
-auto create(const TypeId<T* const>&, const Deserializer<TContext>& ser) -> decltype(access<T*, true>::dispatch(ser))
+auto create(const TypeId<T* const>&, const Deserializer<TContext>& ser) -> decltype(access::dispatchCreate<T*>(ser))
 {
-  return access<T*, true>::dispatch(ser);
+  return access::dispatchCreate<T*>(ser);
 }
 
 template<typename T, typename TContext>
@@ -45,14 +47,18 @@ auto serialize(T* const& data, const Serializer<TContext>& ser) -> decltype(T::p
 {
   gsl_Expects(!ser.loading);
   auto tmp = T::ptrSave(data, ser);
-  access<decltype(tmp), false>::dispatch(tmp, ser);
+  access::dispatchSerialize(tmp, ser);
+  return;
 }
 
 template<typename T, typename TContext>
-auto serialize(T* const& data, const Serializer<TContext>& ser)
+auto serialize(T* const& data,
+
+               const Serializer<TContext>& ser)
   -> decltype(T::ptrSave(T::ptrLoad(T::ptrSave(data, ser), std::declval<Deserializer<TContext>>()), ser), void())
 {
-  access<T* const, false>::dispatch(const_cast<T* const&>(data), ser);
+  access::dispatchSerialize(const_cast<T* const&>(data), ser);
+  return;
 }
 
 template<typename T, typename TContext>
@@ -61,6 +67,8 @@ auto deserialize(T*& data, const Deserializer<TContext>& ser)
                          std::declval<Serializer<TContext>>()),
               void())
 {
-  data = T::ptrLoad(access<decltype(T::ptrSave(data, std::declval<Serializer<TContext>>())), true>::dispatch(ser), ser);
+  data = T::ptrLoad(access::dispatchDeserialize<decltype(T::ptrSave(data, std::declval<Serializer<TContext>>()))>(ser),
+                    ser);
+  return;
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/quantity.h b/src/serialization/quantity.h
index 5c48bd302..38a357daa 100644
--- a/src/serialization/quantity.h
+++ b/src/serialization/quantity.h
@@ -20,4 +20,4 @@ void deserialize(qs::quantity<U, T>& data, const Deserializer<TContext>& ser)
   ser.node >> tmp;
   data = qs::quantity<U, T>{tmp};
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/ratio.h b/src/serialization/ratio.h
index 9af2b13aa..090145434 100644
--- a/src/serialization/ratio.h
+++ b/src/serialization/ratio.h
@@ -3,7 +3,7 @@
 #include "serialization_fwd.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ratio>
 
 namespace serialization
@@ -26,4 +26,4 @@ void deserialize(std::ratio<N, D>& /*data*/, const Deserializer<TContext>& ser)
   gsl_Assert(n == N);
   gsl_Assert(d == D);
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/rendermeshdata_ptr.h b/src/serialization/rendermeshdata_ptr.h
index f98d5d60d..aa423a33e 100644
--- a/src/serialization/rendermeshdata_ptr.h
+++ b/src/serialization/rendermeshdata_ptr.h
@@ -5,13 +5,14 @@
 #include "serialization.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace serialization
 {
 // cppcheck-suppress constParameter
-void serialize(const std::shared_ptr<engine::world::RenderMeshData>& mesh, const Serializer<engine::world::World>& ser)
+inline void serialize(const std::shared_ptr<engine::world::RenderMeshData>& mesh,
+                      const Serializer<engine::world::World>& ser)
 {
   if(mesh == nullptr)
   {
@@ -33,7 +34,8 @@ void serialize(const std::shared_ptr<engine::world::RenderMeshData>& mesh, const
   gsl_Assert(false);
 }
 
-void deserialize(std::shared_ptr<engine::world::RenderMeshData>& data, const Deserializer<engine::world::World>& ser)
+inline void deserialize(std::shared_ptr<engine::world::RenderMeshData>& data,
+                        const Deserializer<engine::world::World>& ser)
 {
   if(ser.isNull())
   {
@@ -47,11 +49,11 @@ void deserialize(std::shared_ptr<engine::world::RenderMeshData>& data, const Des
   data = ser.context->getWorldGeometry().getRenderMesh(tmp);
 }
 
-std::shared_ptr<engine::world::RenderMeshData> create(const TypeId<std::shared_ptr<engine::world::RenderMeshData>>&,
-                                                      const Deserializer<engine::world::World>& ser)
+inline std::shared_ptr<engine::world::RenderMeshData>
+  create(const TypeId<std::shared_ptr<engine::world::RenderMeshData>>&, const Deserializer<engine::world::World>& ser)
 {
   std::shared_ptr<engine::world::RenderMeshData> tmp;
   deserialize(tmp, ser);
   return tmp;
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/serialization.h b/src/serialization/serialization.h
index 5ab3893d3..0643bbbc7 100644
--- a/src/serialization/serialization.h
+++ b/src/serialization/serialization.h
@@ -7,9 +7,11 @@
 #include <boost/algorithm/string/replace.hpp> // IWYU pragma: keep
 #include <boost/assert.hpp>
 #include <boost/log/trivial.hpp>
+#include <c4/substr.hpp>
+#include <concepts>
 #include <cstdint>
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <memory>
 #include <optional>
@@ -19,6 +21,7 @@
 #include <string>
 #include <string_view>
 #include <type_traits>
+#include <utility>
 
 // #define SERIALIZATION_TRACE
 
@@ -61,6 +64,12 @@ struct Default;
 template<typename T>
 struct OptionalValue;
 
+template<typename T>
+concept Arithmetic = std::is_arithmetic_v<T>;
+
+template<typename T>
+concept Enum = std::is_enum_v<T>;
+
 template<bool Loading, typename TContext>
 class BaseSerializer final
 {
@@ -75,7 +84,7 @@ class BaseSerializer final
   using LazyQueue = std::queue<LazyWithContext>;
 
   explicit BaseSerializer(const Node& node,
-                          const gsl::not_null<TContext*>& context,
+                          const gsl_lite::not_null<TContext*>& context,
                           const std::shared_ptr<LazyQueue>& lazyQueue)
       : m_lazyQueue{lazyQueue == nullptr ? std::make_shared<LazyQueue>() : lazyQueue}
       , node{node}
@@ -93,7 +102,7 @@ class BaseSerializer final
 #ifdef SERIALIZATION_TRACE
       BOOST_LOG_TRIVIAL(debug) << "Processing serialization queue...";
 #endif
-      auto current = std::exchange(m_lazyQueue, std::make_shared<LazyQueue>());
+      const auto current = std::exchange(m_lazyQueue, std::make_shared<LazyQueue>());
       while(!current->empty())
       {
         current->front()();
@@ -109,6 +118,7 @@ class BaseSerializer final
 
     gsl_Ensures(node.is_map());
   }
+
 #ifdef SERIALIZATION_TRACE
   std::string getQualifiedKey() const
   {
@@ -130,8 +140,16 @@ class BaseSerializer final
     return result;
   }
 #endif
-  std::optional<BaseSerializer<Loading, TContext>> createMapMemberSerializer(const std::string_view& name,
-                                                                             bool required) const
+
+  [[nodiscard]]
+  bool hasChild(const std::string_view& name) const requires(Loading)
+  {
+    ensureIsMap();
+    auto childNode = node.find_child(c4::csubstr(name.data(), name.size()));
+    return childNode.readable() && childNode.type() != ryml::NOTYPE;
+  }
+
+  std::optional<BaseSerializer> createMapMemberSerializer(const std::string_view& name, const bool required) const
   {
     ensureIsMap();
     auto childNode = node.find_child(c4::csubstr(name.data(), name.size()));
@@ -166,11 +184,14 @@ class BaseSerializer final
   }
 
   template<typename T>
-  void serializeDeserialize(const std::string_view& name, T& data, BaseSerializer<Loading, TContext>& ser) const
+  void serializeDeserialize(const std::string_view& name, T& data, BaseSerializer& ser) const
   {
     try
     {
-      access<T, Loading>::dispatch(data, ser);
+      if constexpr(Loading)
+        access::dispatchDeserialize(data, ser);
+      else
+        access::dispatchSerialize(data, ser);
     }
     catch(Exception&)
     {
@@ -194,7 +215,7 @@ class BaseSerializer final
 
 public:
   mutable Node node;
-  gsl::not_null<TContext*> context;
+  gsl_lite::not_null<TContext*> context;
 
   ~BaseSerializer()
   {
@@ -209,7 +230,7 @@ class BaseSerializer final
   {
     if constexpr(Loading)
       m_lazyQueue->emplace(
-        [lazyCallback = lazyCallback, ser = *this]()
+        [lazyCallback = lazyCallback, ser = *this]
         {
           lazyCallback(ser);
         });
@@ -224,7 +245,7 @@ class BaseSerializer final
   }
 
   template<typename T>
-  void lazy(T* instance, void (T::* member)(const BaseSerializer<Loading, TContext>&)) const
+  void lazy(T* instance, void (T::*member)(const BaseSerializer&)) const
   {
     lazy(LazyCallback<Loading, TContext>{instance, member});
   }
@@ -233,15 +254,14 @@ class BaseSerializer final
   void lazy(const std::string_view& name, T& data) const
   {
     lazy(
-      [pdata = &data, name = name](const BaseSerializer<Loading, TContext>& ser)
+      [pdata = &data, name = name](const BaseSerializer& ser)
       {
         ser(name, *pdata);
       });
   }
 
   template<typename T, typename... Ts>
-  const BaseSerializer<Loading, TContext>&
-    operator()(const std::string_view& headName, T&& headData, Ts&&... tail) const
+  const BaseSerializer& operator()(const std::string_view& headName, T&& headData, Ts&&... tail) const
   {
     (*this)(headName, std::forward<T>(headData));
     if constexpr(sizeof...(tail) > 0)
@@ -249,8 +269,32 @@ class BaseSerializer final
     return *this;
   }
 
+  template<typename T, typename... Ts>
+  const BaseSerializer&
+    operator()(const std::pair<std::string_view, std::string_view>& headNames, T&& headData, Ts&&... tail) const
+  {
+    (*this)(headNames, std::forward<T>(headData));
+    if constexpr(sizeof...(tail) > 0)
+      (*this)(std::forward<Ts>(tail)...);
+    return *this;
+  }
+
   template<typename T>
-  const BaseSerializer<Loading, TContext>& operator()(const std::string_view& name, T&& data) const
+  const BaseSerializer& operator()(const std::pair<std::string_view, std::string_view>& names, T&& data) const
+  {
+    ensureIsMap();
+    if(hasChild(names.first))
+    {
+      return (*this)(names.first, std::forward<T>(data));
+    }
+    else
+    {
+      return (*this)(names.second, std::forward<T>(data));
+    }
+  }
+
+  template<typename T>
+  const BaseSerializer& operator()(const std::string_view& name, T&& data) const
   {
     ensureIsMap();
     BOOST_ASSERT(node.readable());
@@ -270,7 +314,7 @@ class BaseSerializer final
   }
 
   template<typename T>
-  const BaseSerializer<Loading, TContext>& operator()(const std::string_view& name, Default<T>&& data) const
+  const BaseSerializer& operator()(const std::string_view& name, Default<T>&& data) const
   {
     ensureIsMap();
     BOOST_ASSERT(node.readable());
@@ -302,7 +346,7 @@ class BaseSerializer final
   }
 
   template<typename T>
-  const BaseSerializer<Loading, TContext>& operator()(const std::string_view& name, OptionalValue<T>&& data) const
+  const BaseSerializer& operator()(const std::string_view& name, OptionalValue<T>&& data) const
   {
     ensureIsMap();
     BOOST_ASSERT(node.readable());
@@ -312,7 +356,7 @@ class BaseSerializer final
 #endif
 
     auto ser = createMapMemberSerializer(name, false);
-    if(!ser.has_value())
+    if(!ser.has_value() || ser->isNull())
     {
       return *this;
     }
@@ -320,18 +364,18 @@ class BaseSerializer final
     return *this;
   }
 
-  BaseSerializer<Loading, TContext> operator[](gsl::czstring name) const
+  BaseSerializer operator[](const gsl_lite::czstring name) const
   {
     return (*this)[std::string{name}];
   }
 
-  BaseSerializer<Loading, TContext> operator[](const std::string& name) const
+  BaseSerializer operator[](const std::string& name) const
   {
     ensureIsMap();
-    auto existing = node[c4::to_csubstr(name)];
+    auto existing = node.find_child(c4::to_csubstr(name));
     if constexpr(!Loading)
     {
-      if(existing.is_seed() || !existing.readable() || existing.type() == ryml::NOTYPE)
+      if(!existing.readable() || existing.type() == ryml::NOTYPE)
       {
         auto ser = newChild();
         ser.node.set_key(node.tree()->copy_to_arena(c4::to_csubstr(name)));
@@ -350,11 +394,11 @@ class BaseSerializer final
 
   [[nodiscard]] auto withNode(const Node& otherNode) const
   {
-    return BaseSerializer<Loading, TContext>{otherNode, context, m_lazyQueue};
+    return BaseSerializer{otherNode, context, m_lazyQueue};
   }
 
   template<bool LazyLoading = Loading>
-  [[nodiscard]] auto newChild() const -> std::enable_if_t<!LazyLoading, Serializer<TContext>>
+  requires(!LazyLoading) [[nodiscard]] Serializer<TContext> newChild() const
   {
     return withNode(node.append_child());
   }
@@ -363,7 +407,7 @@ class BaseSerializer final
   {
     gsl_Expects(!tag.empty());
 
-    auto normalizedTag
+    const auto normalizedTag
       = std::string{"!<"}
         + boost::algorithm::replace_all_copy(boost::algorithm::replace_all_copy(tag, ">", "&gt;"), " ", "%20") + ">";
     if constexpr(Loading)
@@ -374,8 +418,7 @@ class BaseSerializer final
       if(!node.has_val_tag())
         SERIALIZER_EXCEPTION(("Expected tag \"" + normalizedTag + "\", but got no tag"));
 
-      std::string existingTag = util::toString(node.val_tag());
-      if(existingTag != normalizedTag)
+      if(const std::string existingTag = util::toString(node.val_tag()); existingTag != normalizedTag)
         SERIALIZER_EXCEPTION("Expected tag \"" + normalizedTag + "\", but got \"" + existingTag + "\"");
     }
     else
@@ -383,16 +426,35 @@ class BaseSerializer final
   }
 
   template<bool LazyLoading = Loading>
-  auto setNull() const -> std::enable_if_t<!LazyLoading, void>
+  requires(!LazyLoading) void setNull() const
   {
     node.set_val("~");
     m_tag = "!!null";
   }
 
   template<bool LazyLoading = Loading>
-  auto isNull() const -> std::enable_if_t<LazyLoading, bool>
+  requires(LazyLoading) bool isNull() const
   {
-    return node.has_val_tag() && util::toString(node.val_tag()) == "!!null";
+    if(!node.readable())
+      return false;
+
+    if(node.type() == ryml::NOTYPE)
+      return false;
+
+    if(node.has_val_tag() && util::toString(node.val_tag()) == "!!null")
+      return true;
+
+    if(node.is_container())
+      return false;
+
+    if(!node.has_val())
+      return true;
+
+    if(node.is_val_quoted())
+      return false;
+
+    const std::string val = util::toString(node.val());
+    return val.empty() || val == "~" || val == "null" || val == "Null" || val == "NULL";
   }
 };
 
@@ -400,126 +462,133 @@ namespace detail
 {
 // some specializations to avoid storing 8-bit numbers as characters
 template<typename TContext>
-inline void serialize(const int8_t& data, const Serializer<TContext>& ser)
+void serialize(const int8_t& data, const Serializer<TContext>& ser)
 {
   ser.node << static_cast<int16_t>(data);
 }
 
 template<typename TContext>
-inline void deserialize(int8_t& data, const Deserializer<TContext>& ser)
+void deserialize(int8_t& data, const Deserializer<TContext>& ser)
 {
   int16_t tmp{};
   ser.node >> tmp;
-  data = gsl::narrow<int8_t>(tmp);
+  data = gsl_lite::narrow<int8_t>(tmp);
 }
 
 template<typename TContext>
-inline void serialize(const uint8_t& data, const Serializer<TContext>& ser)
+void serialize(const uint8_t& data, const Serializer<TContext>& ser)
 {
   ser.node << static_cast<uint16_t>(data);
 }
 
 template<typename TContext>
-inline void deserialize(uint8_t& data, const Deserializer<TContext>& ser)
+void deserialize(uint8_t& data, const Deserializer<TContext>& ser)
 {
   uint16_t tmp{};
   ser.node >> tmp;
-  data = gsl::narrow<uint8_t>(tmp);
+  data = gsl_lite::narrow<uint8_t>(tmp);
 }
 
 template<typename T, typename TContext>
-inline void serialize(const T& data, const Serializer<TContext>& ser)
+void serialize(const T& data, const Serializer<TContext>& ser)
 {
   ser.node << data;
 }
 
 template<typename T, typename TContext>
-inline void deserialize(T& data, const Deserializer<TContext>& ser)
+void deserialize(T& data, const Deserializer<TContext>& ser)
 {
+  if constexpr(std::is_same_v<std::decay_t<T>, std::string>)
+  {
+    if(ser.isNull())
+    {
+      data.clear();
+      return;
+    }
+  }
   ser.node >> data;
 }
 
 template<typename T, typename TContext>
-inline std::enable_if_t<std::is_default_constructible_v<T>, T> createTrivial(const TypeId<T>&,
-                                                                             const Deserializer<TContext>& ser)
+requires std::is_default_constructible_v<T> T createTrivial(const TypeId<T>&, const Deserializer<TContext>& ser)
 {
   T tmp{};
-  access<T, true>::dispatch(tmp, ser);
+  access::dispatchDeserialize(tmp, ser);
   return tmp;
 }
 } // namespace detail
 
 template<typename TContext>
-inline void serialize(const std::string& data, const Serializer<TContext>& ser)
+void serialize(const std::string& data, const Serializer<TContext>& ser)
 {
   detail::serialize(data, ser);
 }
 
 template<typename TContext>
-inline void deserialize(std::string& data, const Deserializer<TContext>& ser)
+void deserialize(std::string& data, const Deserializer<TContext>& ser)
 {
   detail::deserialize(data, ser);
 }
 
-template<typename T, typename TContext>
-inline std::enable_if_t<std::is_arithmetic_v<T>, void> serialize(const T& data, const Serializer<TContext>& ser)
+template<Arithmetic T, typename TContext>
+void serialize(const T& data, const Serializer<TContext>& ser)
 {
   detail::serialize(data, ser);
 }
 
-template<typename T, typename TContext>
-inline std::enable_if_t<std::is_arithmetic_v<T>, void> deserialize(T& data, const Deserializer<TContext>& ser)
+template<Arithmetic T, typename TContext>
+void deserialize(T& data, const Deserializer<TContext>& ser)
 {
   detail::deserialize(data, ser);
 }
 
-template<typename T, typename TContext>
-inline std::enable_if_t<std::is_enum_v<T>, void> serialize(const T& data, const Serializer<TContext>& ser)
+template<Enum T, typename TContext>
+void serialize(const T& data, const Serializer<TContext>& ser)
 {
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
   detail::serialize(*reinterpret_cast<const std::underlying_type_t<T>*>(&data), ser);
 }
 
-template<typename T, typename TContext>
-inline std::enable_if_t<std::is_enum_v<T>, void> deserialize(T& data, const Deserializer<TContext>& ser)
+template<Enum T, typename TContext>
+void deserialize(T& data, const Deserializer<TContext>& ser)
 {
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
   detail::deserialize(*reinterpret_cast<std::underlying_type_t<const T>*>(&data), ser);
 }
 
 template<typename TContext>
-inline void serialize(const bool& data, const Serializer<TContext>& ser)
+void serialize(const bool& data, const Serializer<TContext>& ser)
 {
   detail::serialize(data, ser);
 }
 
 template<typename TContext>
-inline void deserialize(bool& data, const Deserializer<TContext>& ser)
+void deserialize(bool& data, const Deserializer<TContext>& ser)
 {
   detail::deserialize(data, ser);
 }
 
-template<typename T, typename TContext>
-inline std::enable_if_t<std::is_arithmetic_v<T>, T> create(const TypeId<T>& tid, const Deserializer<TContext>& ser)
+template<Arithmetic T, typename TContext>
+T create(const TypeId<T>& tid, const Deserializer<TContext>& ser)
 {
   return detail::createTrivial(tid, ser);
 }
 
-template<typename T, typename TContext>
-inline std::enable_if_t<std::is_enum_v<T>, T> create(const TypeId<T>&, const Deserializer<TContext>& ser)
+template<Enum T, typename TContext>
+T create(const TypeId<T>&, const Deserializer<TContext>& ser)
 {
   return static_cast<T>(detail::createTrivial(TypeId<std::underlying_type_t<T>>{}, ser));
 }
 
 template<typename TContext>
-inline bool create(const TypeId<bool>& tid, const Deserializer<TContext>& ser)
+bool create(const TypeId<bool>& tid, const Deserializer<TContext>& ser)
 {
   return detail::createTrivial(tid, ser);
 }
 
 template<typename TContext>
-inline std::string create(const TypeId<std::string>& tid, const Deserializer<TContext>& ser)
+std::string create(const TypeId<std::string>& tid, const Deserializer<TContext>& ser)
 {
   return detail::createTrivial(tid, ser);
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/serialization_fwd.h b/src/serialization/serialization_fwd.h
index eba195bf7..297a9b93e 100644
--- a/src/serialization/serialization_fwd.h
+++ b/src/serialization/serialization_fwd.h
@@ -1,25 +1,26 @@
 #pragma once
 
+#include "concepts.h"
+
 #include <functional>
 
 namespace serialization
 {
-template<typename T>
-struct TypeId;
-
 template<bool Loading, typename TContext>
-class BaseSerializer;
+using LazyCallback = std::function<void(const BaseSerializer<Loading, TContext>&)>;
 
-template<typename TContext>
-using Serializer = BaseSerializer<false, TContext>;
-template<typename TContext>
-using Deserializer = BaseSerializer<true, TContext>;
+namespace access
+{
+template<typename T, typename TContext>
+requires Serializable<T, TContext> void dispatchSerialize(const T& data, const Serializer<TContext>& ser);
 
-template<bool Loading, typename TContext>
-using LazyCallback = std::function<void(const BaseSerializer<Loading, TContext>&)>;
+template<typename T, typename TContext>
+requires Deserializable<T, TContext> void dispatchDeserialize(T& data, const Deserializer<TContext>& ser);
 
-template<typename T, bool Loading>
-struct access;
+template<typename T, typename TContext>
+requires Creatable<T, TContext> T dispatchCreate(const Deserializer<TContext>& ser);
+} // namespace access
 
 #define S_NV(name, obj) name, obj
-} // namespace serialization
+#define S_ANV(name1, name2, obj) std::pair<std::string_view, std::string_view>{name1, name2}, obj
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/skeletalmodeltype_ptr.h b/src/serialization/skeletalmodeltype_ptr.h
index adfb5ca01..e1f0c8b0d 100644
--- a/src/serialization/skeletalmodeltype_ptr.h
+++ b/src/serialization/skeletalmodeltype_ptr.h
@@ -21,7 +21,7 @@ inline core::TypeId::type ptrSave(const engine::world::SkeletalModelType* const&
 }
 
 inline const engine::world::SkeletalModelType* ptrLoad(const TypeId<const engine::world::SkeletalModelType*>&,
-                                                       core::TypeId::type idx,
+                                                       const core::TypeId::type idx,
                                                        const Deserializer<engine::world::World>& ser)
 {
   ser.tag("skeletalmodel");
@@ -30,4 +30,4 @@ inline const engine::world::SkeletalModelType* ptrLoad(const TypeId<const engine
 
   return ser.context->getWorldGeometry().findAnimatedModelForType(core::TypeId{idx}).get();
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/tests/test_basic.cpp b/src/serialization/tests/test_basic.cpp
new file mode 100644
index 000000000..e264ca082
--- /dev/null
+++ b/src/serialization/tests/test_basic.cpp
@@ -0,0 +1,169 @@
+#include "serialization/default.h"
+#include "serialization/optional_value.h"
+#include "serialization/serialization.h"
+#include "serialization/yamldocument.h"
+
+#include <boost/test/unit_test.hpp>
+#include <gsl-lite/gsl-lite.hpp>
+#include <string>
+
+namespace serialization::tests
+{
+struct TestContext
+{
+};
+
+struct BasicConfig
+{
+  std::string socket;
+  int port = 0;
+  bool online = false;
+  enum class Type
+  {
+    A,
+    B
+  } type = Type::A;
+
+  void serialize(const Serializer<TestContext>& ser) const
+  {
+    ser("socket", socket, "port", port, "online", online, "type", type);
+  }
+
+  void deserialize(const Deserializer<TestContext>& ser)
+  {
+    ser("socket", socket, "port", port, "online", online, "type", type);
+  }
+};
+
+BOOST_AUTO_TEST_SUITE(basic_serialization_tests)
+
+BOOST_AUTO_TEST_CASE(test_basic_roundtrip)
+{
+  BasicConfig cfg{.socket = "localhost", .port = 8080, .online = true, .type = BasicConfig::Type::B};
+  const std::string yaml = "config:\n  socket: localhost\n  port: 8080\n  online: true\n  type: 1";
+  YAMLDocument<true> doc{yaml};
+  BasicConfig result;
+  TestContext ctx;
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, result);
+
+  BOOST_CHECK_EQUAL(result.socket, "localhost");
+  BOOST_CHECK_EQUAL(result.port, 8080);
+  BOOST_CHECK_EQUAL(result.online, true);
+  BOOST_CHECK(result.type == BasicConfig::Type::B);
+}
+
+BOOST_AUTO_TEST_CASE(test_string_empty_null_missing)
+{
+  TestContext ctx;
+  auto test_deserialization = [&](const std::string& yaml, const std::string& expected)
+  {
+    YAMLDocument<true> doc{yaml};
+    std::string val = "pre-filled";
+    struct SingleConfig
+    {
+      std::string& ref;
+      void deserialize(const Deserializer<TestContext>& ser)
+      {
+        ser("val", ref);
+      }
+    } cfg{val};
+    doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+    BOOST_CHECK_EQUAL(val, expected);
+  };
+
+  test_deserialization("config:\n  val: ''", "");
+  test_deserialization("config:\n  val: ~", "");
+  test_deserialization("config:\n  val: null", "");
+}
+
+BOOST_AUTO_TEST_CASE(test_is_null_logic)
+{
+  TestContext ctx;
+  auto check_is_null = [&](const std::string& yaml, const bool expected)
+  {
+    const std::string full_yaml = "config:\n  val: " + yaml;
+    YAMLDocument<true> doc{full_yaml};
+    bool result = false;
+    struct Probe
+    {
+      bool& res;
+      void deserialize(const Deserializer<TestContext>& ser)
+      {
+        res = ser["val"].isNull();
+      }
+    } probe{result};
+    doc.deserialize("config", gsl_lite::not_null{&ctx}, probe);
+    BOOST_CHECK_MESSAGE(result == expected,
+                        "YAML val: \"" << yaml << "\", Expected isNull: " << expected << ", Got: " << result);
+  };
+
+  check_is_null("~", true);
+  check_is_null("null", true);
+  check_is_null("!!null", true);
+  check_is_null("", true); // Empty value
+  check_is_null("''", false);
+  check_is_null("\"\"", false);
+  check_is_null("{}", false);
+  check_is_null("[]", false);
+  check_is_null("foo", false);
+}
+
+BOOST_AUTO_TEST_CASE(test_is_null_missing_key)
+{
+  TestContext ctx;
+  YAMLDocument<true> doc{std::string{"config: {}"}};
+  bool result = true;
+  struct Probe
+  {
+    bool& res;
+    void deserialize(const Deserializer<TestContext>& ser)
+    {
+      res = ser["val"].isNull();
+    }
+  } probe{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, probe);
+  BOOST_CHECK_EQUAL(result, false); // Missing key is NOT null
+}
+
+BOOST_AUTO_TEST_CASE(test_optional_value_missing)
+{
+  TestContext ctx;
+  const std::string yaml = "config: {}";
+  YAMLDocument<true> doc{yaml};
+
+  bool online = true;
+  struct OptConfig
+  {
+    bool& ref;
+    void deserialize(const Deserializer<TestContext>& ser)
+    {
+      ser(S_NVO("online", std::ref(ref)));
+    }
+  } cfg{online};
+
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(online, true); // Should remain true as it's missing in YAML
+}
+
+BOOST_AUTO_TEST_CASE(test_default_value)
+{
+  TestContext ctx;
+  const std::string yaml = "config: {}";
+  YAMLDocument<true> doc{yaml};
+
+  int port = 123;
+  struct DefConfig
+  {
+    int& ref;
+    void deserialize(const Deserializer<TestContext>& ser)
+    {
+      ser(S_NVD("port", std::ref(ref), 8080));
+    }
+  } cfg{port};
+
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(port, 8080); // Should be set to default
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+} // namespace serialization::tests
diff --git a/src/serialization/tests/test_containers.cpp b/src/serialization/tests/test_containers.cpp
new file mode 100644
index 000000000..402155141
--- /dev/null
+++ b/src/serialization/tests/test_containers.cpp
@@ -0,0 +1,144 @@
+#include "serialization/array.h"
+#include "serialization/deque.h"
+#include "serialization/map.h"
+#include "serialization/serialization.h"
+#include "serialization/unordered_map.h"
+#include "serialization/unordered_set.h"
+#include "serialization/vector.h"
+#include "serialization/yamldocument.h"
+
+#include <array>
+#include <boost/test/unit_test.hpp>
+#include <deque>
+#include <gsl-lite/gsl-lite.hpp>
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+namespace serialization::tests
+{
+struct ContainerContext
+{
+};
+
+BOOST_AUTO_TEST_SUITE(container_serialization_tests)
+
+BOOST_AUTO_TEST_CASE(test_vector_roundtrip)
+{
+  std::vector data = {1, 2, 3};
+  const std::string yaml = "config:\n  data: !<vector> [1, 2, 3]";
+  YAMLDocument<true> doc{yaml};
+  std::vector<int> result;
+  ContainerContext ctx;
+  struct Cfg
+  {
+    std::vector<int>& ref;
+    void deserialize(const Deserializer<ContainerContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL_COLLECTIONS(result.begin(), result.end(), data.begin(), data.end());
+}
+
+BOOST_AUTO_TEST_CASE(test_deque_roundtrip)
+{
+  std::deque<std::string> data = {"a", "b"};
+  const std::string yaml = "config:\n  data: [a, b]";
+  YAMLDocument<true> doc{yaml};
+  std::deque<std::string> result;
+  ContainerContext ctx;
+  struct Cfg
+  {
+    std::deque<std::string>& ref;
+    void deserialize(const Deserializer<ContainerContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result.size(), 2);
+  BOOST_CHECK_EQUAL(result[0], "a");
+}
+
+BOOST_AUTO_TEST_CASE(test_array_roundtrip)
+{
+  const std::string yaml = "config:\n  data: [10, 20]";
+  YAMLDocument<true> doc{yaml};
+  std::array<int, 2> result;
+  ContainerContext ctx;
+  struct Cfg
+  {
+    std::array<int, 2>& ref;
+    void deserialize(const Deserializer<ContainerContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result[0], 10);
+  BOOST_CHECK_EQUAL(result[1], 20);
+}
+
+BOOST_AUTO_TEST_CASE(test_map_roundtrip)
+{
+  const std::string yaml = "config:\n  data: !<map> [{key: key, value: 42}]";
+  YAMLDocument<true> doc{yaml};
+  std::map<std::string, int> result;
+  ContainerContext ctx;
+  struct Cfg
+  {
+    std::map<std::string, int>& ref;
+    void deserialize(const Deserializer<ContainerContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result["key"], 42);
+}
+
+BOOST_AUTO_TEST_CASE(test_unordered_map_roundtrip)
+{
+  std::unordered_map<int, std::string> data = {{1, "one"}};
+  const std::string yaml = "config:\n  data: !<unordered_map> [{key: 1, value: one}]";
+  YAMLDocument<true> doc{yaml};
+  std::unordered_map<int, std::string> result;
+  ContainerContext ctx;
+  struct Cfg
+  {
+    std::unordered_map<int, std::string>& ref;
+    void deserialize(const Deserializer<ContainerContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result[1], "one");
+}
+
+BOOST_AUTO_TEST_CASE(test_unordered_set_roundtrip)
+{
+  std::unordered_set data = {1, 2};
+  const std::string yaml = "config:\n  data: [1, 2]";
+  YAMLDocument<true> doc{yaml};
+  std::unordered_set<int> result;
+  ContainerContext ctx;
+  struct Cfg
+  {
+    std::unordered_set<int>& ref;
+    void deserialize(const Deserializer<ContainerContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result.size(), 2);
+  BOOST_CHECK(result.count(1));
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+} // namespace serialization::tests
diff --git a/src/serialization/tests/test_main.cpp b/src/serialization/tests/test_main.cpp
new file mode 100644
index 000000000..c4f438a38
--- /dev/null
+++ b/src/serialization/tests/test_main.cpp
@@ -0,0 +1,2 @@
+#define BOOST_TEST_MODULE serialization_test
+#include <boost/test/unit_test.hpp>
diff --git a/src/serialization/tests/test_math.cpp b/src/serialization/tests/test_math.cpp
new file mode 100644
index 000000000..961b06f68
--- /dev/null
+++ b/src/serialization/tests/test_math.cpp
@@ -0,0 +1,61 @@
+#include "serialization/glm.h"
+#include "serialization/serialization.h"
+#include "serialization/yamldocument.h"
+
+#include <boost/test/unit_test.hpp>
+#include <glm/glm.hpp>
+#include <gsl-lite/gsl-lite.hpp>
+
+namespace serialization::tests
+{
+struct MathContext
+{
+};
+
+BOOST_AUTO_TEST_SUITE(math_serialization_tests)
+
+BOOST_AUTO_TEST_CASE(test_glm_vec3_roundtrip)
+{
+  const std::string yaml = "config:\n  data: !<vec> [1.0, 2.0, 3.0]";
+  YAMLDocument<true> doc{yaml};
+  glm::vec3 result;
+  MathContext ctx;
+  struct Cfg
+  {
+    glm::vec3& ref;
+    void deserialize(const Deserializer<MathContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result.x, 1.0f);
+  BOOST_CHECK_EQUAL(result.y, 2.0f);
+  BOOST_CHECK_EQUAL(result.z, 3.0f);
+}
+
+BOOST_AUTO_TEST_CASE(test_glm_mat4_roundtrip)
+{
+  auto data = glm::mat4(1.0f);
+  data[0][3] = 42.0f;
+
+  // mat4 is serialized as a flat sequence of 16 floats: m[0][0], m[0][1], m[0][2], m[0][3], m[1][0], ...
+  const std::string yaml = "config:\n  data: !<mat4> [1,0,0,42, 0,1,0,0, 0,0,1,0, 0,0,0,1]";
+
+  YAMLDocument<true> doc{yaml};
+  glm::mat4 result;
+  MathContext ctx;
+  struct Cfg
+  {
+    glm::mat4& ref;
+    void deserialize(const Deserializer<MathContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result[0][3], 42.0f);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+} // namespace serialization::tests
diff --git a/src/serialization/tests/test_misc.cpp b/src/serialization/tests/test_misc.cpp
new file mode 100644
index 000000000..09736b5b6
--- /dev/null
+++ b/src/serialization/tests/test_misc.cpp
@@ -0,0 +1,292 @@
+#include "serialization/bitset.h"
+#include "serialization/chrono.h"
+#include "serialization/named_enum.h"
+#include "serialization/not_null.h"
+#include "serialization/optional.h"
+#include "serialization/pair.h"
+#include "serialization/path.h"
+#include "serialization/quantity.h"
+#include "serialization/ratio.h"
+#include "serialization/serialization.h"
+#include "serialization/variant.h"
+#include "serialization/vector_element.h"
+#include "serialization/yamldocument.h"
+
+#include <bitset>
+#include <boost/test/unit_test.hpp>
+#include <chrono>
+#include <filesystem>
+#include <gsl-lite/gsl-lite.hpp>
+#include <optional>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
+
+namespace serialization::tests
+{
+struct MiscContext
+{
+};
+
+BOOST_AUTO_TEST_SUITE(misc_serialization_tests)
+
+BOOST_AUTO_TEST_CASE(test_bitset_roundtrip)
+{
+  std::bitset<4> data;
+  data.set(1);
+  data.set(3);
+  const std::string yaml = "config:\n  data: !<bitset> '0101'";
+  YAMLDocument<true> doc{yaml};
+  std::bitset<4> result;
+  MiscContext ctx;
+  struct Cfg
+  {
+    std::bitset<4>& ref;
+    void deserialize(const Deserializer<MiscContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result.test(1), true);
+  BOOST_CHECK_EQUAL(result.test(3), true);
+  BOOST_CHECK_EQUAL(result.test(0), false);
+  BOOST_CHECK_EQUAL(result.test(2), false);
+}
+
+BOOST_AUTO_TEST_CASE(test_optional_roundtrip)
+{
+  const std::string yaml = "config:\n  data: 42";
+  YAMLDocument<true> doc{yaml};
+  std::optional<int> result;
+  MiscContext ctx;
+  struct Cfg
+  {
+    std::optional<int>& ref;
+    void deserialize(const Deserializer<MiscContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_REQUIRE(result.has_value());
+  BOOST_CHECK_EQUAL(*result, 42);
+}
+
+struct TestUnit
+{
+  static std::string suffix()
+  {
+    return "m";
+  }
+};
+
+BOOST_AUTO_TEST_CASE(test_quantity_roundtrip)
+{
+  const std::string yaml = "config:\n  data: !<m> 100";
+  YAMLDocument<true> doc{yaml};
+  qs::quantity<TestUnit, int> result{0};
+  MiscContext ctx;
+  struct Cfg
+  {
+    qs::quantity<TestUnit, int>& ref;
+    void deserialize(const Deserializer<MiscContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result.get(), 100);
+}
+
+BOOST_AUTO_TEST_CASE(test_chrono_roundtrip)
+{
+  const std::string yaml = "config:\n  data: !<duration>\n    count: 60\n    period:\n      n: 1\n      d: 1";
+  YAMLDocument<true> doc{yaml};
+  std::chrono::seconds result{0};
+  MiscContext ctx;
+  struct Cfg
+  {
+    std::chrono::seconds& ref;
+    void deserialize(const Deserializer<MiscContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result.count(), 60);
+}
+
+BOOST_AUTO_TEST_CASE(test_pair_roundtrip)
+{
+  std::pair<int, std::string> data = {1, "two"};
+  const std::string yaml = "config:\n  data: !<pair>\n    first: 1\n    second: two";
+  YAMLDocument<true> doc{yaml};
+  std::pair<int, std::string> result;
+  MiscContext ctx;
+  struct Cfg
+  {
+    std::pair<int, std::string>& ref;
+    void deserialize(const Deserializer<MiscContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result.first, 1);
+  BOOST_CHECK_EQUAL(result.second, "two");
+}
+
+BOOST_AUTO_TEST_CASE(test_path_roundtrip)
+{
+  std::filesystem::path data = "foo/bar";
+  const std::string yaml = "config:\n  data: !<path> foo/bar";
+  YAMLDocument<true> doc{yaml};
+  std::filesystem::path result;
+  MiscContext ctx;
+  struct Cfg
+  {
+    std::filesystem::path& ref;
+    void deserialize(const Deserializer<MiscContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result.string(), "foo/bar");
+}
+
+BOOST_AUTO_TEST_CASE(test_variant_roundtrip)
+{
+  std::variant<int, std::string> result;
+  MiscContext ctx;
+
+  auto test = [&](const std::string& yaml)
+  {
+    YAMLDocument<true> doc{yaml};
+    struct Cfg
+    {
+      std::variant<int, std::string>& ref;
+      void deserialize(const Deserializer<MiscContext>& ser)
+      {
+        ser("data", ref);
+      }
+    } cfg{result};
+    doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  };
+
+  test("config:\n  data: 42");
+  BOOST_CHECK(std::holds_alternative<int>(result));
+  BOOST_CHECK_EQUAL(std::get<int>(result), 42);
+
+  test("config:\n  data: hello");
+  BOOST_CHECK(std::holds_alternative<std::string>(result));
+  BOOST_CHECK_EQUAL(std::get<std::string>(result), "hello");
+}
+
+enum class MyEnum
+{
+  A,
+  B
+};
+inline std::string toString(const MyEnum e)
+{
+  return e == MyEnum::A ? "A" : "B";
+}
+
+struct MyEnumConverter
+{
+  static std::string name()
+  {
+    return "my_enum";
+  }
+  static MyEnum fromString(const std::string& s)
+  {
+    if(s == "A")
+      return MyEnum::A;
+    if(s == "B")
+      return MyEnum::B;
+    throw std::domain_error("invalid");
+  }
+};
+
+BOOST_AUTO_TEST_CASE(test_named_enum_roundtrip)
+{
+  const std::string yaml = "config:\n  data: !<my_enum> A";
+  YAMLDocument<true> doc{yaml};
+  NamedEnum<MyEnum, MyEnumConverter> result;
+  MiscContext ctx;
+  struct Cfg
+  {
+    NamedEnum<MyEnum, MyEnumConverter>& ref;
+    void deserialize(const Deserializer<MiscContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK(result.value == MyEnum::A);
+}
+
+BOOST_AUTO_TEST_CASE(test_vector_element_roundtrip)
+{
+  std::vector vec = {10, 20, 30};
+  const int* element = &vec[1];
+
+  MiscContext ctx;
+
+  // Test serialization
+  {
+    YAMLDocument<false> doc{"unused.yaml"};
+    struct Cfg
+    {
+      const std::vector<int>& vec;
+      const int*& element;
+      void serialize(const Serializer<MiscContext>& ser) const
+      {
+        ser("el", VectorElement{std::cref(vec), std::ref(element)});
+      }
+    } cfg{vec, element};
+    doc.serialize("config", gsl_lite::not_null{&ctx}, cfg);
+  }
+
+  // Test deserialization
+  {
+    std::string yaml = "config:\n  el: !<element> 2";
+    YAMLDocument<true> doc{yaml};
+    const int* result = nullptr;
+    struct Cfg
+    {
+      const std::vector<int>& vec;
+      const int*& ref;
+      void deserialize(const Deserializer<MiscContext>& ser)
+      {
+        ser("el", VectorElement{std::cref(vec), std::ref(ref)});
+      }
+    } cfg{vec, result};
+    doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+    BOOST_CHECK_EQUAL(result, &vec[2]);
+    BOOST_CHECK_EQUAL(*result, 30);
+  }
+}
+
+BOOST_AUTO_TEST_CASE(test_ratio_roundtrip)
+{
+  const std::string yaml = "config:\n  data: !<ratio>\n    n: 1\n    d: 1000";
+  YAMLDocument<true> doc{yaml};
+  std::ratio<1, 1000> result;
+  MiscContext ctx;
+  struct Cfg
+  {
+    std::ratio<1, 1000>& ref;
+    void deserialize(const Deserializer<MiscContext>& ser)
+    {
+      ser("data", ref);
+    }
+  } cfg{result};
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+} // namespace serialization::tests
diff --git a/src/serialization/tests/test_ptr.cpp b/src/serialization/tests/test_ptr.cpp
new file mode 100644
index 000000000..bbbd5bb93
--- /dev/null
+++ b/src/serialization/tests/test_ptr.cpp
@@ -0,0 +1,104 @@
+#include "serialization/not_null.h"
+#include "serialization/ptr.h"
+#include "serialization/serialization.h"
+#include "serialization/yamldocument.h"
+
+#include <boost/test/unit_test.hpp>
+#include <gsl-lite/gsl-lite.hpp>
+#include <map>
+#include <memory>
+#include <string>
+
+namespace serialization::tests
+{
+struct PtrContext
+{
+  std::map<int, std::unique_ptr<int>> objects;
+
+  int save(int* ptr) const
+  {
+    for(const auto& [id, obj] : objects)
+    {
+      if(obj.get() == ptr)
+        return id;
+    }
+    return -1;
+  }
+
+  int* load(const int id) const
+  {
+    if(const auto it = objects.find(id); it != objects.end())
+      return it->second.get();
+    return nullptr;
+  }
+};
+} // namespace serialization::tests
+
+namespace serialization
+{
+inline int ptrSave(int* const& ptr, const Serializer<tests::PtrContext>& ser)
+{
+  return ser.context->save(ptr);
+}
+
+inline int* ptrLoad(const TypeId<int*>&, const int id, const Deserializer<tests::PtrContext>& ser)
+{
+  return ser.context->load(id);
+}
+} // namespace serialization
+
+namespace serialization::tests
+{
+BOOST_AUTO_TEST_SUITE(ptr_serialization_tests)
+
+BOOST_AUTO_TEST_CASE(test_ptr_roundtrip)
+{
+  PtrContext ctx;
+  ctx.objects[1] = std::make_unique<int>(42);
+  ctx.objects[2] = std::make_unique<int>(100);
+
+  const std::string yaml = "config:\n  ptr: 1";
+  YAMLDocument<true> doc{yaml};
+
+  int* result = nullptr;
+  struct Cfg
+  {
+    int*& ref;
+    void deserialize(const Deserializer<PtrContext>& ser)
+    {
+      ser("ptr", ref);
+    }
+  } cfg{result};
+
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result, ctx.objects[1].get());
+  BOOST_CHECK_EQUAL(*result, 42);
+}
+
+BOOST_AUTO_TEST_CASE(test_not_null_ptr_roundtrip)
+{
+  PtrContext ctx;
+  ctx.objects[1] = std::make_unique<int>(42);
+
+  const std::string yaml = "config:\n  ptr: 1";
+  YAMLDocument<true> doc{yaml};
+
+  int dummy = 0;
+  gsl_lite::not_null<int*> result = gsl_lite::make_not_null(&dummy);
+
+  struct Cfg
+  {
+    gsl_lite::not_null<int*>& ref;
+    void deserialize(const Deserializer<PtrContext>& ser)
+    {
+      ser("ptr", ref);
+    }
+  } cfg{result};
+
+  doc.deserialize("config", gsl_lite::not_null{&ctx}, cfg);
+  BOOST_CHECK_EQUAL(result.get(), ctx.objects[1].get());
+  BOOST_CHECK_EQUAL(*result, 42);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+} // namespace serialization::tests
diff --git a/src/serialization/unordered_map.h b/src/serialization/unordered_map.h
index b47a52352..2ba2dd63d 100644
--- a/src/serialization/unordered_map.h
+++ b/src/serialization/unordered_map.h
@@ -3,7 +3,7 @@
 #include "access.h" // IWYU pragma: keep
 #include "serialization.h"
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <unordered_map>
 
 namespace serialization
@@ -30,7 +30,7 @@ void deserialize(std::unordered_map<T, U>& data, const Deserializer<TContext>& s
     gsl_Assert(element.is_map());
     gsl_Assert(element.num_children() == 2);
     auto elemSer = ser.withNode(element);
-    data.emplace(access<T, true>::dispatch(elemSer["key"]), access<U, true>::dispatch(elemSer["value"]));
+    data.emplace(access::dispatchCreate<T>(elemSer["key"]), access::dispatchCreate<U>(elemSer["value"]));
   }
 }
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/unordered_set.h b/src/serialization/unordered_set.h
index f4408830a..8ab49cff1 100644
--- a/src/serialization/unordered_set.h
+++ b/src/serialization/unordered_set.h
@@ -15,7 +15,7 @@ void serialize(std::unordered_set<T>& data, const Serializer<TContext>& ser)
   for(auto& element : data)
   {
     const auto tmp = ser.newChild();
-    access<T, false>::dispatch(element, tmp);
+    access::dispatchSerialize(element, tmp);
   }
 }
 
@@ -27,7 +27,7 @@ void deserialize(std::unordered_set<T>& data, const Deserializer<TContext>& ser)
   data.reserve(ser.node.num_children());
   for(const auto& element : ser.node.children())
   {
-    data.emplace(access<T, true>::dispatch(ser.withNode(element)));
+    data.emplace(access::dispatchCreate<T>(ser.withNode(element)));
   }
 }
 } // namespace serialization
diff --git a/src/serialization/variant.h b/src/serialization/variant.h
index 4e1703bfa..af5e8cc6f 100644
--- a/src/serialization/variant.h
+++ b/src/serialization/variant.h
@@ -24,13 +24,13 @@ void trySerialize(const std::variant<Ts...>& data, const BaseSerializer<Loading,
     {
       using Alternative = std::variant_alternative_t<I, std::variant<Ts...>>;
       if constexpr(Loading)
-        access<Alternative, true>::dispatch(std::get<I>(data), ser);
+        access::dispatchSerialize(std::get<I>(data), ser);
       else if(std::holds_alternative<Alternative>(data))
-        access<Alternative, false>::dispatch(std::get<I>(data), ser);
+        access::dispatchSerialize(std::get<I>(data), ser);
       else
         trySerialize<I + 1u>(data, ser);
     }
-    catch(Exception&)
+    catch(const std::exception&)
     {
       trySerialize<I + 1u>(data, ser);
     }
@@ -51,9 +51,9 @@ std::variant<Ts...> tryCreate(const TypeId<std::variant<Ts...>>& tid, const Dese
     try
     {
       using Alternative = std::variant_alternative_t<I, std::variant<Ts...>>;
-      return access<Alternative, true>::dispatch(ser);
+      return access::dispatchCreate<Alternative>(ser);
     }
-    catch(Exception&)
+    catch(const std::exception&)
     {
       return tryCreate<I + 1u>(tid, ser);
     }
@@ -72,4 +72,10 @@ std::variant<Ts...> create(const TypeId<std::variant<Ts...>>& tid, const Deseria
 {
   return detail::tryCreate<0>(tid, ser);
 }
-} // namespace serialization
+
+template<typename... Ts, typename TContext>
+void deserialize(std::variant<Ts...>& data, const Deserializer<TContext>& ser)
+{
+  data = create(TypeId<std::variant<Ts...>>{}, ser);
+}
+} // namespace serialization
\ No newline at end of file
diff --git a/src/serialization/vector.h b/src/serialization/vector.h
index bf435508a..4137e8eba 100644
--- a/src/serialization/vector.h
+++ b/src/serialization/vector.h
@@ -4,7 +4,7 @@
 #include "serialization.h"
 
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <vector>
 
 namespace serialization
@@ -17,7 +17,7 @@ void serialize(const std::vector<T>& data, const Serializer<TContext>& ser)
   for(auto& element : data)
   {
     const auto tmp = ser.newChild();
-    access<T, false>::dispatch(element, tmp);
+    access::dispatchSerialize(element, tmp);
   }
 }
 
@@ -33,7 +33,7 @@ void deserialize(std::vector<T>& data, const Deserializer<TContext>& ser)
                  std::back_inserter(data),
                  [&ser](const ryml::ConstNodeRef& element)
                  {
-                   return access<T, true>::dispatch(ser.withNode(element));
+                   return access::dispatchCreate<T>(ser.withNode(element));
                  });
 }
 
@@ -41,6 +41,7 @@ template<typename T>
 struct DeserializingFrozenVector
 {
   std::reference_wrapper<std::vector<T>> vec;
+
   explicit DeserializingFrozenVector(std::reference_wrapper<std::vector<T>>&& vec)
       : vec{std::move(vec)}
   {
@@ -53,7 +54,7 @@ struct DeserializingFrozenVector
     auto it = vec.get().begin();
     for(const auto& element : ser.node.children())
     {
-      access<T, true>::dispatch(*it++, ser.withNode(element));
+      access::dispatchDeserialize(*it++, ser.withNode(element));
     }
   }
 };
@@ -62,6 +63,7 @@ template<typename T>
 struct SerializingFrozenVector
 {
   std::reference_wrapper<const std::vector<T>> vec;
+
   explicit SerializingFrozenVector(std::reference_wrapper<const std::vector<T>>&& vec)
       : vec{std::move(vec)}
   {
@@ -74,7 +76,7 @@ struct SerializingFrozenVector
     for(auto& element : vec.get())
     {
       const auto tmp = ser.newChild();
-      access<T, false>::dispatch(element, tmp);
+      access::dispatchSerialize(element, tmp);
     }
   }
 };
diff --git a/src/serialization/vector_element.h b/src/serialization/vector_element.h
index 2a00c8a7a..8f44a44e3 100644
--- a/src/serialization/vector_element.h
+++ b/src/serialization/vector_element.h
@@ -3,7 +3,7 @@
 #include "serialization.h"
 
 #include <functional>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <vector>
 
 namespace serialization
@@ -11,10 +11,10 @@ namespace serialization
 template<typename T>
 struct VectorElement final
 {
-  VectorElement(const VectorElement<T>&) = delete;
-  VectorElement(VectorElement<T>&&) = delete;
-  void operator=(VectorElement<T>&&) = delete;
-  void operator=(const VectorElement<T>&) = delete;
+  VectorElement(const VectorElement&) = delete;
+  VectorElement(VectorElement&&) = delete;
+  void operator=(VectorElement&&) = delete;
+  void operator=(const VectorElement&) = delete;
 
   std::reference_wrapper<const std::vector<T>> vec;
   std::reference_wrapper<const T*> element;
@@ -77,23 +77,23 @@ struct VectorElement final
 template<typename T>
 struct DeserializingNotNullVectorElement final
 {
-  DeserializingNotNullVectorElement(const DeserializingNotNullVectorElement<T>&) = delete;
-  DeserializingNotNullVectorElement(DeserializingNotNullVectorElement<T>&&) = delete;
-  void operator=(DeserializingNotNullVectorElement<T>&&) = delete;
-  void operator=(const DeserializingNotNullVectorElement<T>&) = delete;
+  DeserializingNotNullVectorElement(const DeserializingNotNullVectorElement&) = delete;
+  DeserializingNotNullVectorElement(DeserializingNotNullVectorElement&&) = delete;
+  void operator=(DeserializingNotNullVectorElement&&) = delete;
+  void operator=(const DeserializingNotNullVectorElement&) = delete;
 
   std::reference_wrapper<std::vector<T>> vec;
-  std::reference_wrapper<gsl::not_null<const T*>> element;
+  std::reference_wrapper<gsl_lite::not_null<const T*>> element;
 
   explicit DeserializingNotNullVectorElement(std::reference_wrapper<std::vector<T>>&& vec,
-                                             std::reference_wrapper<gsl::not_null<T*>>&& element)
+                                             std::reference_wrapper<gsl_lite::not_null<T*>>&& element)
       : vec{std::move(vec)}
       , element{std::move(element)}
   {
   }
 
   explicit DeserializingNotNullVectorElement(std::reference_wrapper<std::vector<T>>&& vec,
-                                             std::reference_wrapper<gsl::not_null<const T*>>&& element)
+                                             std::reference_wrapper<gsl_lite::not_null<const T*>>&& element)
       : vec{std::move(vec)}
       , element{std::move(element)}
   {
@@ -106,23 +106,23 @@ struct DeserializingNotNullVectorElement final
     ser.tag("element");
     std::ptrdiff_t n = 0;
     ser.node >> n;
-    element.get() = gsl::not_null{&vec.get().at(n)};
+    element.get() = gsl_lite::not_null{&vec.get().at(n)};
   }
 };
 
 template<typename T>
 struct SerializingNotNullVectorElement final
 {
-  SerializingNotNullVectorElement(const SerializingNotNullVectorElement<T>&) = delete;
-  SerializingNotNullVectorElement(SerializingNotNullVectorElement<T>&&) = delete;
-  void operator=(SerializingNotNullVectorElement<T>&&) = delete;
-  void operator=(const SerializingNotNullVectorElement<T>&) = delete;
+  SerializingNotNullVectorElement(const SerializingNotNullVectorElement&) = delete;
+  SerializingNotNullVectorElement(SerializingNotNullVectorElement&&) = delete;
+  void operator=(SerializingNotNullVectorElement&&) = delete;
+  void operator=(const SerializingNotNullVectorElement&) = delete;
 
   std::reference_wrapper<const std::vector<T>> vec;
-  std::reference_wrapper<const gsl::not_null<const T*>> element;
+  std::reference_wrapper<const gsl_lite::not_null<const T*>> element;
 
   explicit SerializingNotNullVectorElement(std::reference_wrapper<const std::vector<T>>&& vec,
-                                           std::reference_wrapper<const gsl::not_null<const T*>>&& element)
+                                           std::reference_wrapper<const gsl_lite::not_null<const T*>>&& element)
       : vec{std::move(vec)}
       , element{std::move(element)}
   {
diff --git a/src/serialization/yamldocument.h b/src/serialization/yamldocument.h
index b2e75c705..f26afd567 100644
--- a/src/serialization/yamldocument.h
+++ b/src/serialization/yamldocument.h
@@ -7,7 +7,7 @@
 #include <clocale>
 #include <filesystem>
 #include <fstream>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ryml.hpp>
 #include <string>
 #include <type_traits>
@@ -17,28 +17,26 @@ namespace serialization
 template<bool Loading>
 class YAMLDocument
 {
-private:
   std::filesystem::path m_filename;
   std::string m_buffer;
   ryml::Tree m_tree;
 
   struct CustomErrorCallbacks
   {
-  public:
     explicit CustomErrorCallbacks()
         : m_callbacks{ryml::get_callbacks()}
     {
       ryml::set_callbacks(
         ryml::Callbacks{nullptr,
-                        [](size_t length, void* /*hint*/, void* /*user_data*/) -> gsl::owner<void*>
+                        [](const size_t length, void* /*hint*/, void* /*user_data*/) -> gsl_lite::owner<void*>
                         {
                           return new char[length];
                         },
-                        [](gsl::owner<void*> mem, size_t /*length*/, void* /*user_data*/)
+                        [](const gsl_lite::owner<void*> mem, size_t /*length*/, void* /*user_data*/)
                         {
                           delete[] static_cast<char*>(mem);
                         },
-                        [](const char* msg, size_t msg_len, ryml::Location /*location*/, void* /*user_data*/)
+                        [](const char* msg, const size_t msg_len, ryml::Location /*location*/, void* /*user_data*/)
                         {
                           const std::string msgStr{msg, msg_len};
                           SERIALIZER_EXCEPTION(msgStr);
@@ -58,6 +56,7 @@ class YAMLDocument
   explicit YAMLDocument(const std::filesystem::path& filename)
       : m_filename{filename}
   {
+    CustomErrorCallbacks callbacks{};
     BOOST_LOG_TRIVIAL(info) << "Opening " << filename << ", Loading=" << Loading;
     if constexpr(Loading)
     {
@@ -79,83 +78,74 @@ class YAMLDocument
     }
   }
 
-  template<bool Lazy = Loading>
-  explicit YAMLDocument(std::string data, std::enable_if_t<Lazy, bool> = true)
+  explicit YAMLDocument(std::string data) requires(Loading)
       : m_buffer{std::move(data)}
   {
-    static_assert(Lazy);
-
+    CustomErrorCallbacks callbacks{};
     m_tree = ryml::parse_in_arena(c4::to_csubstr(m_buffer));
   }
 
-  template<typename T, typename TContext, bool DelayLoading = Loading>
-  auto deserialize(const std::string& key, TContext& context) -> std::enable_if_t<DelayLoading, T>
+  template<typename T, typename TContext>
+  T deserialize(const std::string& key, TContext& context) requires(Loading)
   {
-    const std::string oldLocale = gsl::not_null{setlocale(LC_NUMERIC, nullptr)}.get();
+    const std::string oldLocale = gsl_lite::not_null{setlocale(LC_NUMERIC, nullptr)}.get();
     setlocale(LC_NUMERIC, "C");
 
     CustomErrorCallbacks callbacks{};
 
     Deserializer<TContext> ser{m_tree.rootref()[c4::to_csubstr(key)], context, true, nullptr};
-    auto result = access<T, true>::dispatch(ser);
+    auto result = access::dispatchCreate<T>(ser);
     ser.processQueues();
 
     setlocale(LC_NUMERIC, oldLocale.c_str());
     return result;
   }
 
-  template<typename T, typename TContext, bool DelayLoading = Loading>
-  auto deserialize(const std::string& key,
-                   const gsl::not_null<TContext*>& context,
-                   T& data) -> std::enable_if_t<DelayLoading, void>
+  template<typename T, typename TContext>
+  void deserialize(const std::string& key, const gsl_lite::not_null<TContext*>& context, T& data) requires(Loading)
   {
-    const std::string oldLocale = gsl::not_null{setlocale(LC_NUMERIC, nullptr)}.get();
+    const std::string oldLocale = gsl_lite::not_null{setlocale(LC_NUMERIC, nullptr)}.get();
     setlocale(LC_NUMERIC, "C");
 
     CustomErrorCallbacks callbacks{};
 
     Deserializer<TContext> ser{m_tree.rootref()[c4::to_csubstr(key)], context, nullptr};
-    access<T, true>::dispatch(data, ser);
+    access::dispatchDeserialize(data, ser);
     ser.processQueues();
 
     setlocale(LC_NUMERIC, oldLocale.c_str());
   }
 
-  template<typename T, typename TContext, bool DelayLoading = Loading>
-  auto serialize(const std::string& key,
-                 const gsl::not_null<TContext*>& context,
-                 T& data) -> std::enable_if_t<!DelayLoading, void>
+  template<typename T, typename TContext>
+  void serialize(const std::string& key, const gsl_lite::not_null<TContext*>& context, T& data) requires(!Loading)
   {
-    const std::string oldLocale = gsl::not_null{setlocale(LC_NUMERIC, nullptr)}.get();
+    const std::string oldLocale = gsl_lite::not_null{setlocale(LC_NUMERIC, nullptr)}.get();
     setlocale(LC_NUMERIC, "C");
 
     CustomErrorCallbacks callbacks{};
 
     Serializer<TContext> ser{m_tree.rootref()[m_tree.copy_to_arena(c4::to_csubstr(key))], context, nullptr};
-    access<T, false>::dispatch(data, ser);
+    access::dispatchSerialize(data, ser);
     ser.processQueues();
 
     setlocale(LC_NUMERIC, oldLocale.c_str());
   }
 
-  template<bool DelayLoading = Loading>
-  auto write() const -> std::enable_if_t<!DelayLoading, void>
+  void write() const requires(!Loading)
   {
     std::ofstream file{m_filename, std::ios::out | std::ios::trunc};
     gsl_Assert(file.is_open());
     file << m_tree.rootref();
   }
 
-  template<bool DelayLoading = Loading>
-  auto operator[](const std::string& key) -> std::enable_if_t<DelayLoading, ryml::NodeRef>
+  ryml::NodeRef operator[](const std::string& key) requires(Loading)
   {
     return m_tree.rootref()[c4::to_csubstr(key)];
   }
 
-  template<bool DelayLoading = Loading>
-  auto getRoot() -> std::enable_if_t<DelayLoading, ryml::NodeRef>
+  ryml::NodeRef getRoot() requires(Loading)
   {
     return m_tree.rootref();
   }
 };
-} // namespace serialization
+} // namespace serialization
\ No newline at end of file
diff --git a/src/shared/gslu.h b/src/shared/gslu.h
index ebae11dce..873ebd78c 100644
--- a/src/shared/gslu.h
+++ b/src/shared/gslu.h
@@ -1,24 +1,24 @@
 #pragma once
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 
 namespace gslu
 {
 template<typename T>
-using nn_shared = gsl::not_null<std::shared_ptr<T>>;
+using nn_shared = gsl_lite::not_null<std::shared_ptr<T>>;
 template<typename T>
-using nn_unique = gsl::not_null<std::unique_ptr<T>>;
+using nn_unique = gsl_lite::not_null<std::unique_ptr<T>>;
 
 template<typename T, typename U>
-[[nodiscard]] inline nn_shared<T> static_pointer_cast(const nn_shared<U>& ptr) noexcept
+[[nodiscard]] nn_shared<T> static_pointer_cast(const nn_shared<U>& ptr) noexcept
 {
   return nn_shared<T>{std::static_pointer_cast<T>(ptr.get())};
 }
 
 template<typename T, typename U>
-[[nodiscard]] inline std::shared_ptr<T> dynamic_pointer_cast(const nn_shared<U>& ptr) noexcept
+[[nodiscard]] std::shared_ptr<T> dynamic_pointer_cast(const nn_shared<U>& ptr) noexcept
 {
   return std::dynamic_pointer_cast<T>(ptr.get());
 }
-} // namespace gslu
+} // namespace gslu
\ No newline at end of file
diff --git a/src/shared/paths.cpp b/src/shared/paths.cpp
index a51c2e267..cc3d385f5 100644
--- a/src/shared/paths.cpp
+++ b/src/shared/paths.cpp
@@ -3,7 +3,7 @@
 #include <boost/log/trivial.hpp>
 #include <cstdlib>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <optional>
 
 std::filesystem::path getExpectedSysUserDataDir()
@@ -89,4 +89,4 @@ std::optional<std::filesystem::path> findEngineDataDir()
   }
 
   return std::nullopt;
-}
+}
\ No newline at end of file
diff --git a/src/soglb/gl/api/soglb_core.hpp b/src/soglb/gl/api/soglb_core.hpp
index 339a42b6c..650bbee4b 100644
--- a/src/soglb/gl/api/soglb_core.hpp
+++ b/src/soglb/gl/api/soglb_core.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <type_traits>
 
 struct __GLsync; // NOLINT(bugprone-reserved-identifier)
@@ -56,7 +56,7 @@ class Bitfield final
   EnumType m_value{};
 
   // cppcheck-suppress noExplicitConstructor
-  constexpr Bitfield(EnumType value) // NOLINT(google-explicit-constructor)
+  constexpr Bitfield(const EnumType value) // NOLINT(google-explicit-constructor)
       : m_value{value}
   {
   }
@@ -68,7 +68,7 @@ class Bitfield final
   {
   }
 
-  constexpr Bitfield(const Bitfield<T>& rhs) noexcept
+  constexpr Bitfield(const Bitfield& rhs) noexcept
       : m_value{rhs.m_value}
   {
   }
@@ -85,40 +85,40 @@ class Bitfield final
     return (m_value & static_cast<EnumType>(value)) != 0;
   }
 
-  constexpr Bitfield<T>& operator=(const Bitfield<T>& rhs) noexcept
+  constexpr Bitfield& operator=(const Bitfield& rhs) noexcept
   {
     m_value = rhs.m_value;
     return *this;
   }
 
-  constexpr Bitfield<T> operator|(const Bitfield<T>& rhs) const noexcept
+  constexpr Bitfield operator|(const Bitfield& rhs) const noexcept
   {
-    return Bitfield<T>{m_value | rhs.value()};
+    return Bitfield{m_value | rhs.value()};
   }
 
-  constexpr Bitfield<T>& operator|=(const Bitfield<T>& rhs) noexcept
+  constexpr Bitfield& operator|=(const Bitfield& rhs) noexcept
   {
     m_value |= rhs.m_value;
     return *this;
   }
 
-  constexpr Bitfield<T> operator|(T rhs) const noexcept
+  constexpr Bitfield operator|(T rhs) const noexcept
   {
-    return Bitfield<T>{m_value | static_cast<EnumType>(rhs)};
+    return Bitfield{m_value | static_cast<EnumType>(rhs)};
   }
 
-  constexpr Bitfield<T>& operator|=(T rhs) noexcept
+  constexpr Bitfield& operator|=(T rhs) noexcept
   {
     m_value |= static_cast<EnumType>(rhs);
     return *this;
   }
 
-  constexpr Bitfield<T> operator&(const Bitfield<T>& rhs) const noexcept
+  constexpr Bitfield operator&(const Bitfield& rhs) const noexcept
   {
-    return Bitfield<T>{m_value & rhs.value()};
+    return Bitfield{m_value & rhs.value()};
   }
 
-  constexpr Bitfield<T>& operator&=(const Bitfield<T>& rhs) noexcept
+  constexpr Bitfield& operator&=(const Bitfield& rhs) noexcept
   {
     m_value &= rhs.m_value;
     return *this;
@@ -134,10 +134,9 @@ using DebugProc = void(SOGLB_API*)(DebugSource source,
                                    DebugType type,
                                    uint32_t id,
                                    DebugSeverity severity,
-                                   core::SizeType length,
-                                   gsl::czstring message,
+                                   SizeType length,
+                                   gsl_lite::czstring message,
                                    const void* userParam);
-
 } // namespace core
 
 namespace detail
@@ -172,4 +171,4 @@ constexpr auto constAway(T* ptr)
   return ConstAway<T>(ptr);
 }
 } // namespace detail
-} // namespace gl::api
+} // namespace gl::api
\ No newline at end of file
diff --git a/src/soglb/gl/bindableresource.h b/src/soglb/gl/bindableresource.h
index 63a743065..5b0434b5a 100644
--- a/src/soglb/gl/bindableresource.h
+++ b/src/soglb/gl/bindableresource.h
@@ -18,8 +18,8 @@ class BindableResource : public Resource<_Identifier>
 public:
   using Resource<_Identifier>::Identifier;
   using Resource<_Identifier>::getHandle;
-  using Allocator = typename Resource<_Identifier>::Allocator;
-  using Deleter = typename Resource<_Identifier>::Deleter;
+  using Allocator = Resource<_Identifier>::Allocator;
+  using Deleter = Resource<_Identifier>::Deleter;
 
   void bind() const
   {
@@ -44,7 +44,7 @@ class BindableResource : public Resource<_Identifier>
     BOOST_ASSERT(static_cast<bool>(m_binder));
   }
 
-  virtual ~BindableResource()
+  ~BindableResource() override
   {
     if(getHandle() != 0)
       unbind();
diff --git a/src/soglb/gl/buffer.h b/src/soglb/gl/buffer.h
index cb0a1dbbd..1f98476c2 100644
--- a/src/soglb/gl/buffer.h
+++ b/src/soglb/gl/buffer.h
@@ -7,7 +7,7 @@
 #include <functional>
 #include <gl/glassert.h>
 #include <gl/resource.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string_view>
 
 namespace gl
@@ -23,10 +23,10 @@ class MappedBuffer final
   friend class Buffer<T, Target>;
 
 public:
-  MappedBuffer(const MappedBuffer<T, Target>&) = delete;
-  MappedBuffer(MappedBuffer<T, Target>&&) = delete;
-  void operator=(const MappedBuffer<T, Target>&) = delete;
-  void operator==(MappedBuffer<T, Target>&&) = delete;
+  MappedBuffer(const MappedBuffer&) = delete;
+  MappedBuffer(MappedBuffer&&) = delete;
+  void operator=(const MappedBuffer&) = delete;
+  void operator==(MappedBuffer&&) = delete;
 
   ~MappedBuffer()
   {
@@ -79,7 +79,7 @@ class MappedBuffer final
   }
 
   std::reference_wrapper<Buffer<T, Target>> m_buffer;
-  gsl::span<T> m_span;
+  gsl_lite::span<T> m_span;
 };
 
 // NOLINTNEXTLINE(bugprone-reserved-identifier)
@@ -87,21 +87,21 @@ template<typename T, api::BufferTarget _Target>
 class Buffer : public Resource<api::ObjectIdentifier::Buffer>
 {
 public:
-  Buffer(const Buffer<T, _Target>&) = delete;
-  Buffer(Buffer<T, _Target>&&) = delete;
-  void operator=(const Buffer<T, _Target>&) = delete;
-  void operator==(Buffer<T, _Target>&&) = delete;
+  Buffer(const Buffer&) = delete;
+  Buffer(Buffer&&) = delete;
+  void operator=(const Buffer&) = delete;
+  void operator==(Buffer&&) = delete;
 
   static constexpr api::BufferTarget Target = _Target;
 
-  explicit Buffer(const std::string_view& label, api::BufferUsage usage, const gsl::span<const T>& data)
+  explicit Buffer(const std::string_view& label, const api::BufferUsage usage, const gsl_lite::span<const T>& data)
       : Resource{api::createBuffers, api::deleteBuffers, label}
       , m_size{data.size()}
   {
     GL_ASSERT(api::namedBufferData(getHandle(), data.size_bytes(), data.data(), usage));
   }
 
-  explicit Buffer(const std::string_view& label, api::BufferUsage usage, size_t size)
+  explicit Buffer(const std::string_view& label, const api::BufferUsage usage, const size_t size)
       : Resource{api::createBuffers, api::deleteBuffers, label}
       , m_size{size}
   {
@@ -109,7 +109,7 @@ class Buffer : public Resource<api::ObjectIdentifier::Buffer>
   }
 
   explicit Buffer(const std::string_view& label, api::BufferUsage usage, const T& data)
-      : Buffer{label, usage, gsl::span{&data, 1}}
+      : Buffer{label, usage, gsl_lite::span{&data, 1}}
   {
   }
 
@@ -124,16 +124,16 @@ class Buffer : public Resource<api::ObjectIdentifier::Buffer>
     return MappedBuffer{std::ref(*this), static_cast<T*>(data), m_size};
   }
 
-  void setSubData(const gsl::span<const T>& data, const api::core::SizeType start)
+  void setSubData(const gsl_lite::span<const T>& data, const api::core::SizeType start)
   {
     BOOST_ASSERT(start + data.size() <= m_size);
     GL_ASSERT(api::namedBufferSubData(
-      getHandle(), gsl::narrow<std::intptr_t>(sizeof(T) * start), data.size_bytes(), data.data()));
+      getHandle(), gsl_lite::narrow<std::intptr_t>(sizeof(T) * start), data.size_bytes(), data.data()));
   }
 
   void setSubData(const T& data, const api::core::SizeType start)
   {
-    setSubData(gsl::span{&data, 1}, start);
+    setSubData(gsl_lite::span{&data, 1}, start);
   }
 
   [[nodiscard]] auto size() const noexcept
@@ -166,7 +166,9 @@ class ElementArrayBuffer final : public Buffer<T, api::BufferTarget::ElementArra
   using Buffer<T, api::BufferTarget::ElementArrayBuffer>::size;
   using Buffer<T, api::BufferTarget::ElementArrayBuffer>::empty;
 
-  explicit ElementArrayBuffer(const std::string_view& label, api::BufferUsage usage, const gsl::span<const T>& data)
+  explicit ElementArrayBuffer(const std::string_view& label,
+                              api::BufferUsage usage,
+                              const gsl_lite::span<const T>& data)
       : Buffer<T, api::BufferTarget::ElementArrayBuffer>{label, usage, data}
   {
   }
@@ -176,21 +178,21 @@ class ElementArrayBuffer final : public Buffer<T, api::BufferTarget::ElementArra
   {
   }
 
-  void drawElements(api::PrimitiveType primitiveType) const
+  void drawElements(const api::PrimitiveType primitiveType) const
   {
     if(!empty())
     {
       GL_ASSERT(
-        api::drawElements(primitiveType, gsl::narrow<api::core::SizeType>(size()), DrawElementsType<T>, nullptr));
+        api::drawElements(primitiveType, gsl_lite::narrow<api::core::SizeType>(size()), DrawElementsType<T>, nullptr));
     }
   }
 
-  void drawElements(api::PrimitiveType primitiveType, api::core::SizeType instanceCount) const
+  void drawElements(const api::PrimitiveType primitiveType, const api::core::SizeType instanceCount) const
   {
     if(!empty())
     {
       GL_ASSERT(api::drawElementsInstanced(
-        primitiveType, gsl::narrow<api::core::SizeType>(size()), DrawElementsType<T>, nullptr, instanceCount));
+        primitiveType, gsl_lite::narrow<api::core::SizeType>(size()), DrawElementsType<T>, nullptr, instanceCount));
     }
   }
 };
diff --git a/src/soglb/gl/cimgwrapper.cpp b/src/soglb/gl/cimgwrapper.cpp
index 0f1e41b98..ad5367f69 100644
--- a/src/soglb/gl/cimgwrapper.cpp
+++ b/src/soglb/gl/cimgwrapper.cpp
@@ -19,7 +19,7 @@
 #include <boost/assert.hpp>
 #include <CImg.h>
 #include <fstream>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <utility>
 
@@ -48,6 +48,7 @@ struct PcxHeader
   uint16_t height;
   std::array<uint8_t, 54> _pad;
 };
+
 static_assert(sizeof(PcxHeader) == 128);
 } // namespace
 
@@ -184,11 +185,12 @@ const uint8_t* CImgWrapper::data() const
   return m_image->data();
 }
 
-void CImgWrapper::savePng(const std::string& filename, bool premultiply)
+void CImgWrapper::savePng(const std::string& filename, const bool premultiply)
 {
   deinterleave();
   if(!premultiply)
   {
+    // ReSharper disable once CppExpressionWithoutSideEffects
     m_image->save_png(filename.c_str(), 1);
     return;
   }
@@ -197,6 +199,7 @@ void CImgWrapper::savePng(const std::string& filename, bool premultiply)
   tmp->get_shared_channel(0).mul(tmp->get_shared_channel(3)) /= 255;
   tmp->get_shared_channel(1).mul(tmp->get_shared_channel(3)) /= 255;
   tmp->get_shared_channel(2).mul(tmp->get_shared_channel(3)) /= 255;
+  // ReSharper disable once CppExpressionWithoutSideEffects
   tmp->save_png(filename.c_str(), 1);
 }
 
@@ -233,7 +236,7 @@ CImgWrapper& CImgWrapper::operator=(CImgWrapper&& other) noexcept
   return *this;
 }
 
-void CImgWrapper::extendBorder(int margin)
+void CImgWrapper::extendBorder(const int margin)
 {
   gsl_Expects(margin >= 0);
   unshare();
@@ -251,9 +254,9 @@ void CImgWrapper::fromScreenshot()
   interleave();
 }
 
-gslu::nn_shared<gl::Texture2D<gl::PremultipliedSRGBA8>> CImgWrapper::toTexture(const std::string_view& label)
+gslu::nn_shared<Texture2D<PremultipliedSRGBA8>> CImgWrapper::toTexture(const std::string_view& label)
 {
-  auto result = gsl::make_shared<gl::Texture2D<gl::PremultipliedSRGBA8>>(glm::ivec2{width(), height()}, label);
+  auto result = gsl_lite::make_shared<Texture2D<PremultipliedSRGBA8>>(glm::ivec2{width(), height()}, label);
   result->assign(asPremultipliedPixels());
   return result;
 }
@@ -261,29 +264,29 @@ gslu::nn_shared<gl::Texture2D<gl::PremultipliedSRGBA8>> CImgWrapper::toTexture(c
 void CImgWrapper::premultiplyPixels()
 {
   interleave();
-  for(auto& px : gsl::make_span(const_cast<gl::SRGBA8*>(reinterpret_cast<const gl::SRGBA8*>(data())),
-                                gsl::narrow<size_t>(width()) * gsl::narrow<size_t>(height())))
+  for(auto& px : gsl_lite::make_span(const_cast<SRGBA8*>(reinterpret_cast<const SRGBA8*>(data())),
+                                     gsl_lite::narrow<size_t>(width()) * gsl_lite::narrow<size_t>(height())))
   {
     px.channels = premultiply(px).channels;
   }
 }
 
-gsl::span<const gl::SRGBA8> CImgWrapper::pixels()
+gsl_lite::span<const SRGBA8> CImgWrapper::pixels()
 {
-  static_assert(sizeof(gl::SRGBA8) == 4);
+  static_assert(sizeof(SRGBA8) == 4);
   interleave();
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-  return gsl::make_span(reinterpret_cast<const gl::SRGBA8*>(data()),
-                        gsl::narrow<size_t>(width()) * gsl::narrow<size_t>(height()));
+  return gsl_lite::make_span(reinterpret_cast<const SRGBA8*>(data()),
+                             gsl_lite::narrow<size_t>(width()) * gsl_lite::narrow<size_t>(height()));
 }
 
-gsl::span<const gl::PremultipliedSRGBA8> CImgWrapper::asPremultipliedPixels()
+gsl_lite::span<const PremultipliedSRGBA8> CImgWrapper::asPremultipliedPixels()
 {
-  static_assert(sizeof(gl::PremultipliedSRGBA8) == 4);
+  static_assert(sizeof(PremultipliedSRGBA8) == 4);
   interleave();
   // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-  return gsl::make_span(reinterpret_cast<const gl::PremultipliedSRGBA8*>(data()),
-                        gsl::narrow<size_t>(width()) * gsl::narrow<size_t>(height()));
+  return gsl_lite::make_span(reinterpret_cast<const PremultipliedSRGBA8*>(data()),
+                             gsl_lite::narrow<size_t>(width()) * gsl_lite::narrow<size_t>(height()));
 }
 
 std::unique_ptr<cimg_library::CImg<uint8_t>> CImgWrapper::loadPcx(const std::filesystem::path& filename)
@@ -317,7 +320,7 @@ std::unique_ptr<cimg_library::CImg<uint8_t>> CImgWrapper::loadPcx(const std::fil
   stream.read(reinterpret_cast<char*>(&palette[0][0]), sizeof(Palette));
   gsl_Assert(stream.good());
 
-  auto readByte = [&stream]()
+  auto readByte = [&stream]
   {
     uint8_t tmp;
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
@@ -345,7 +348,7 @@ std::unique_ptr<cimg_library::CImg<uint8_t>> CImgWrapper::loadPcx(const std::fil
     gsl_Assert(repeat <= remainingPixels);
     while(repeat > 0)
     {
-      *px++ = gl::SRGBA8{(*c)[0], (*c)[1], (*c)[2], 255};
+      *px++ = SRGBA8{(*c)[0], (*c)[1], (*c)[2], 255};
       --remainingPixels;
       --repeat;
     }
@@ -354,4 +357,4 @@ std::unique_ptr<cimg_library::CImg<uint8_t>> CImgWrapper::loadPcx(const std::fil
   img->permute_axes("yzcx");
   return img;
 }
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/cimgwrapper.h b/src/soglb/gl/cimgwrapper.h
index cc0dd013a..7ba2ad894 100644
--- a/src/soglb/gl/cimgwrapper.h
+++ b/src/soglb/gl/cimgwrapper.h
@@ -6,7 +6,7 @@
 #include <cstdint>
 #include <filesystem>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -22,7 +22,6 @@ namespace gl
 {
 class CImgWrapper
 {
-private:
   std::unique_ptr<cimg_library::CImg<uint8_t>> m_image;
   bool m_interleaved = false;
 
@@ -72,15 +71,15 @@ class CImgWrapper
 
   [[nodiscard]] const uint8_t* data() const;
 
-  [[nodiscard]] gsl::span<const gl::SRGBA8> pixels();
+  [[nodiscard]] gsl_lite::span<const SRGBA8> pixels();
 
-  [[nodiscard]] gsl::span<const gl::PremultipliedSRGBA8> asPremultipliedPixels();
+  [[nodiscard]] gsl_lite::span<const PremultipliedSRGBA8> asPremultipliedPixels();
 
   void premultiplyPixels();
 
   void savePng(const std::string& filename, bool premultiply);
 
-  void savePng(const std::filesystem::path& filename, bool premultiply)
+  void savePng(const std::filesystem::path& filename, const bool premultiply)
   {
     savePng(filename.string(), premultiply);
   }
@@ -91,10 +90,10 @@ class CImgWrapper
 
   void fromScreenshot();
 
-  gslu::nn_shared<gl::Texture2D<gl::PremultipliedSRGBA8>> toTexture(const std::string_view& label);
+  gslu::nn_shared<Texture2D<PremultipliedSRGBA8>> toTexture(const std::string_view& label);
 
 private:
   void unshare();
   static std::unique_ptr<cimg_library::CImg<uint8_t>> loadPcx(const std::filesystem::path& filename);
 };
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/debuggroup.h b/src/soglb/gl/debuggroup.h
index e2ad5323a..b44a760ca 100644
--- a/src/soglb/gl/debuggroup.h
+++ b/src/soglb/gl/debuggroup.h
@@ -4,7 +4,7 @@
 #include "glassert.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string_view>
 
 #ifndef SOGLB_NO_DEBUG_GROUPS
@@ -34,8 +34,10 @@ class DebugGroup final
 public:
   explicit DebugGroup(const std::string_view& message, const uint32_t id = 0)
   {
-    GL_ASSERT(api::pushDebugGroup(
-      api::DebugSource::DebugSourceApplication, id, gsl::narrow<api::core::SizeType>(message.size()), message.data()));
+    GL_ASSERT(api::pushDebugGroup(api::DebugSource::DebugSourceApplication,
+                                  id,
+                                  gsl_lite::narrow<api::core::SizeType>(message.size()),
+                                  message.data()));
   }
 
   DebugGroup(const DebugGroup&) = delete;
@@ -49,4 +51,4 @@ class DebugGroup final
   }
 };
 #endif
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/font.cpp b/src/soglb/gl/font.cpp
index db55954ab..8680d380e 100644
--- a/src/soglb/gl/font.cpp
+++ b/src/soglb/gl/font.cpp
@@ -13,7 +13,7 @@
 #include <ft2build.h>
 #include <gl/pixel.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <optional>
 #include <stdexcept>
@@ -31,7 +31,7 @@ namespace
 {
 FT_Library freeTypeLib = nullptr;
 
-gsl::czstring getFreeTypeErrorMessage(const FT_Error err)
+gsl_lite::czstring getFreeTypeErrorMessage(const FT_Error err)
 {
 #undef __FTERRORS_H__
 #define FT_ERRORDEF(e, v, s) \
@@ -43,6 +43,7 @@ gsl::czstring getFreeTypeErrorMessage(const FT_Error err)
 #define FT_ERROR_END_LIST }
 
 #include FT_ERRORS_H
+
   return "(Unknown error)";
 }
 
@@ -51,8 +52,7 @@ FT_Library loadFreeTypeLib()
   if(freeTypeLib != nullptr)
     return freeTypeLib;
 
-  const auto error = FT_Init_FreeType(&freeTypeLib);
-  if(error != FT_Err_Ok)
+  if(const auto error = FT_Init_FreeType(&freeTypeLib); error != FT_Err_Ok)
   {
     BOOST_LOG_TRIVIAL(fatal) << "Failed to load freetype library: " << getFreeTypeErrorMessage(error);
     BOOST_THROW_EXCEPTION(std::runtime_error("Failed to load freetype library"));
@@ -61,7 +61,7 @@ FT_Library loadFreeTypeLib()
   gsl_Ensures(freeTypeLib != nullptr);
 
   atexit(
-    []()
+    []
     {
       FT_Done_FreeType(freeTypeLib);
       freeTypeLib = nullptr;
@@ -72,14 +72,15 @@ FT_Library loadFreeTypeLib()
 } // namespace
 
 FT_Error ftcFaceRequester(const FTC_FaceID /*face_id*/,
-                          const FT_Library library,  // NOLINT(misc-misplaced-const)
-                          const FT_Pointer req_data, // NOLINT(misc-misplaced-const)
+                          const FT_Library library,
+                          // NOLINT(misc-misplaced-const)
+                          const FT_Pointer req_data,
+                          // NOLINT(misc-misplaced-const)
                           FT_Face* aface)
 {
   const auto* path = static_cast<std::filesystem::path*>(req_data);
 
-  const auto error = FT_New_Face(library, path->string().c_str(), 0, aface);
-  if(error != FT_Err_Ok)
+  if(const auto error = FT_New_Face(library, path->string().c_str(), 0, aface); error != FT_Err_Ok)
   {
     BOOST_LOG_TRIVIAL(fatal) << "Failed to load font " << *path << ": " << getFreeTypeErrorMessage(error);
     BOOST_THROW_EXCEPTION(std::runtime_error("Failed to load font"));
@@ -91,14 +92,14 @@ Font::Font(std::filesystem::path ttf)
     : m_filename{std::move(ttf)}
 {
   BOOST_LOG_TRIVIAL(debug) << "Loading font " << m_filename;
-  auto error
-    = FTC_Manager_New(loadFreeTypeLib(),
-                      0,
-                      0,
-                      0,
-                      &ftcFaceRequester,
-                      const_cast<std::filesystem::path*>(&m_filename), // NOLINT(cppcoreguidelines-pro-type-const-cast)
-                      &m_cache);
+  auto error = FTC_Manager_New(loadFreeTypeLib(),
+                               0,
+                               0,
+                               0,
+                               &ftcFaceRequester,
+                               const_cast<std::filesystem::path*>(&m_filename),
+                               // NOLINT(cppcoreguidelines-pro-type-const-cast)
+                               &m_cache);
   if(error != FT_Err_Ok)
   {
     BOOST_LOG_TRIVIAL(fatal) << "Failed to create cache manager: " << getFreeTypeErrorMessage(error);
@@ -125,7 +126,7 @@ Font::Font(std::filesystem::path ttf)
   const auto face = getFace();
   const auto h = face->ascender - face->descender;
   gsl_Assert(h != 0);
-  m_lineHeight = gsl::narrow_cast<float>(face->height) / gsl::narrow_cast<float>(h);
+  m_lineHeight = gsl_lite::narrow_cast<float>(face->height) / gsl_lite::narrow_cast<float>(h);
 }
 
 Font::~Font()
@@ -134,13 +135,16 @@ Font::~Font()
   m_cache = nullptr;
 }
 
-void Font::drawText(
-  Image<PremultipliedSRGBA8>& img, const gsl::czstring text, glm::ivec2 xy, const PremultipliedSRGBA8& color, int size)
+void Font::drawText(Image<PremultipliedSRGBA8>& img,
+                    const gsl_lite::czstring text,
+                    glm::ivec2 xy,
+                    const PremultipliedSRGBA8& color,
+                    int size)
 {
   gsl_Expects(text != nullptr);
   gsl_Expects(size > 0);
 
-  size = gsl::narrow_cast<int>(gsl::narrow_cast<float>(size) * m_lineHeight);
+  size = gsl_lite::narrow_cast<int>(gsl_lite::narrow_cast<float>(size) * m_lineHeight);
 
   const int baseAlpha = color.channels[3];
   auto currentColor = color;
@@ -159,14 +163,13 @@ void Font::drawText(
     const auto glyphIndex = getGlyphIndex(chr);
     if(glyphIndex == 0)
     {
-      BOOST_LOG_TRIVIAL(warning) << "Failed to load character '" << chr << "'";
+      BOOST_LOG_TRIVIAL(warning) << "Failed to load character '" << static_cast<int32_t>(chr) << "'";
       continue;
     }
 
     FTC_SBit sbit = nullptr;
     FTC_Node node = nullptr;
-    const auto error = FTC_SBitCache_Lookup(m_sbitCache, &imgType, glyphIndex, &sbit, &node);
-    if(error != FT_Err_Ok)
+    if(const auto error = FTC_SBitCache_Lookup(m_sbitCache, &imgType, glyphIndex, &sbit, &node); error != FT_Err_Ok)
     {
       BOOST_LOG_TRIVIAL(warning) << "Failed to load from sbit cache: " << getFreeTypeErrorMessage(error);
       FTC_Node_Unref(node, m_cache);
@@ -179,7 +182,7 @@ void Font::drawText(
       {
         for(int dx = 0; dx < sbit->width; dx++, i++)
         {
-          currentColor.channels[3] = gsl::narrow_cast<uint8_t>(sbit->buffer[i] * baseAlpha / 255);
+          currentColor.channels[3] = gsl_lite::narrow_cast<uint8_t>(sbit->buffer[i] * baseAlpha / 255);
           img.set(xy + glm::ivec2{dx + sbit->left, dy - sbit->top}, currentColor, true);
         }
       }
@@ -208,12 +211,12 @@ void Font::drawText(Image<PremultipliedSRGBA8>& img,
   drawText(img, text.c_str(), xy, premultiply(SRGBA8{red, green, blue, alpha}), size);
 }
 
-void Font::drawText(Image<ScalarByte>& img, const gsl::czstring text, glm::ivec2 xy, int size)
+void Font::drawText(Image<ScalarByte>& img, const gsl_lite::czstring text, glm::ivec2 xy, int size)
 {
-  Expects(text != nullptr);
-  Expects(size > 0);
+  gsl_Expects(text != nullptr);
+  gsl_Expects(size > 0);
 
-  size = gsl::narrow_cast<int>(gsl::narrow_cast<float>(size) * m_lineHeight);
+  size = gsl_lite::narrow_cast<int>(gsl_lite::narrow_cast<float>(size) * m_lineHeight);
 
   FTC_ImageTypeRec imgType;
   imgType.face_id = this;
@@ -235,8 +238,7 @@ void Font::drawText(Image<ScalarByte>& img, const gsl::czstring text, glm::ivec2
 
     FTC_SBit sbit = nullptr;
     FTC_Node node = nullptr;
-    const auto error = FTC_SBitCache_Lookup(m_sbitCache, &imgType, glyphIndex, &sbit, &node);
-    if(error != FT_Err_Ok)
+    if(const auto error = FTC_SBitCache_Lookup(m_sbitCache, &imgType, glyphIndex, &sbit, &node); error != FT_Err_Ok)
     {
       BOOST_LOG_TRIVIAL(warning) << "Failed to load from sbit cache: " << getFreeTypeErrorMessage(error);
       FTC_Node_Unref(node, m_cache);
@@ -250,7 +252,7 @@ void Font::drawText(Image<ScalarByte>& img, const gsl::czstring text, glm::ivec2
         for(int dx = 0; dx < sbit->width; dx++, i++)
         {
           img.set(xy + glm::ivec2{dx + sbit->left, dy - sbit->top},
-                  ScalarByte{gsl::narrow_cast<uint8_t>(sbit->buffer[i])});
+                  ScalarByte{gsl_lite::narrow_cast<uint8_t>(sbit->buffer[i])});
         }
       }
     }
@@ -271,12 +273,12 @@ void Font::drawText(Image<ScalarByte>& img, const std::string& text, const glm::
   drawText(img, text.c_str(), xy, size);
 }
 
-std::pair<glm::ivec2, glm::ivec2> Font::measure(const gsl::czstring text, int size)
+std::pair<glm::ivec2, glm::ivec2> Font::measure(const gsl_lite::czstring text, int size)
 {
-  Expects(text != nullptr);
-  Expects(size > 0);
+  gsl_Expects(text != nullptr);
+  gsl_Expects(size > 0);
 
-  size = gsl::narrow_cast<int>(gsl::narrow_cast<float>(size) * m_lineHeight);
+  size = gsl_lite::narrow_cast<int>(gsl_lite::narrow_cast<float>(size) * m_lineHeight);
 
   FTC_ImageTypeRec imgType;
   imgType.face_id = this;
@@ -303,8 +305,7 @@ std::pair<glm::ivec2, glm::ivec2> Font::measure(const gsl::czstring text, int si
 
     FTC_SBit sbit = nullptr;
     FTC_Node node = nullptr;
-    const auto error = FTC_SBitCache_Lookup(m_sbitCache, &imgType, glyphIndex, &sbit, &node);
-    if(error != FT_Err_Ok)
+    if(const auto error = FTC_SBitCache_Lookup(m_sbitCache, &imgType, glyphIndex, &sbit, &node); error != FT_Err_Ok)
     {
       BOOST_LOG_TRIVIAL(warning) << "Failed to load from sbit cache: " << getFreeTypeErrorMessage(error);
       FTC_Node_Unref(node, m_cache);
@@ -338,7 +339,8 @@ FT_Face Font::getFace() const
 {
   FT_Face face = nullptr;
   if(FTC_Manager_LookupFace(m_cache,
-                            const_cast<Font*>(this), // NOLINT(cppcoreguidelines-pro-type-const-cast)
+                            const_cast<Font*>(this),
+                            // NOLINT(cppcoreguidelines-pro-type-const-cast)
                             &face)
      != FT_Err_Ok)
   {
@@ -354,14 +356,15 @@ int Font::getGlyphKernAdvance(const FT_UInt left, const FT_UInt right) const
   {
     BOOST_THROW_EXCEPTION(std::runtime_error("Failed to retrieve kerning information"));
   }
-  return gsl::narrow<int>(std::lround(gsl::narrow<float>(k.x) / 64.0f * m_lineHeight));
+  return gsl_lite::narrow<int>(std::lround(gsl_lite::narrow<float>(k.x) / 64.0f * m_lineHeight));
 }
 
 FT_UInt Font::getGlyphIndex(const char32_t chr) const
 {
   return FTC_CMapCache_Lookup(m_cmapCache,
-                              const_cast<Font*>(this), // NOLINT(cppcoreguidelines-pro-type-const-cast)
+                              const_cast<Font*>(this),
+                              // NOLINT(cppcoreguidelines-pro-type-const-cast)
                               -1,
                               chr);
 }
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/font.h b/src/soglb/gl/font.h
index df7d531ea..b8d59d444 100644
--- a/src/soglb/gl/font.h
+++ b/src/soglb/gl/font.h
@@ -7,7 +7,7 @@
 #include <filesystem>
 #include <ft2build.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 #include <utility>
 
@@ -28,8 +28,11 @@ class Font
   Font& operator=(const Font&) = delete;
   Font& operator=(Font&&) = delete;
 
-  void drawText(
-    Image<PremultipliedSRGBA8>& img, gsl::czstring text, glm::ivec2 xy, const PremultipliedSRGBA8& color, int size);
+  void drawText(Image<PremultipliedSRGBA8>& img,
+                gsl_lite::czstring text,
+                glm::ivec2 xy,
+                const PremultipliedSRGBA8& color,
+                int size);
   void drawText(Image<PremultipliedSRGBA8>& img,
                 const std::string& text,
                 const glm::ivec2& xy,
@@ -39,10 +42,10 @@ class Font
                 uint8_t alpha,
                 int size);
 
-  void drawText(Image<ScalarByte>& img, gsl::czstring text, glm::ivec2 xy, int size);
+  void drawText(Image<ScalarByte>& img, gsl_lite::czstring text, glm::ivec2 xy, int size);
   void drawText(Image<ScalarByte>& img, const std::string& text, const glm::ivec2& xy, int size);
 
-  [[nodiscard]] std::pair<glm::ivec2, glm::ivec2> measure(gsl::czstring text, int size);
+  [[nodiscard]] std::pair<glm::ivec2, glm::ivec2> measure(gsl_lite::czstring text, int size);
   [[nodiscard]] std::pair<glm::ivec2, glm::ivec2> measure(const std::string& text, int size);
 
   int getGlyphKernAdvance(FT_UInt left, FT_UInt right) const;
@@ -58,4 +61,4 @@ class Font
   std::filesystem::path m_filename;
   FT_Face getFace() const;
 };
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/framebuffer.cpp b/src/soglb/gl/framebuffer.cpp
index bba5fde32..0814f7472 100644
--- a/src/soglb/gl/framebuffer.cpp
+++ b/src/soglb/gl/framebuffer.cpp
@@ -7,7 +7,7 @@
 #include <boost/log/trivial.hpp>
 #include <cstdint>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <string_view>
 #include <utility>
@@ -20,7 +20,7 @@ void TextureAttachment::attach(const Framebuffer& framebuffer, const api::Frameb
   GL_ASSERT(api::namedFramebufferTexture(framebuffer.getHandle(), attachment, m_texture->getHandle(), m_level));
 }
 
-Framebuffer::Framebuffer(Framebuffer::Attachments attachments,
+Framebuffer::Framebuffer(Attachments attachments,
                          const std::string_view& label,
                          RenderState&& renderState,
                          const glm::ivec2& size)
@@ -47,7 +47,7 @@ Framebuffer::Framebuffer(Framebuffer::Attachments attachments,
   if(!colorAttachments.empty())
   {
     GL_ASSERT(api::namedFramebufferDrawBuffers(
-      getHandle(), gsl::narrow<api::core::SizeType>(colorAttachments.size()), colorAttachments.data()));
+      getHandle(), gsl_lite::narrow<api::core::SizeType>(colorAttachments.size()), colorAttachments.data()));
   }
   else
   {
@@ -100,7 +100,7 @@ bool Framebuffer::isComplete() const
   return result == api::FramebufferStatus::FramebufferComplete;
 }
 
-void Framebuffer::blit(const Framebuffer& target, api::BlitFramebufferFilter filter)
+void Framebuffer::blit(const Framebuffer& target, const api::BlitFramebufferFilter filter) const
 {
   GL_ASSERT(api::memoryBarrier(api::MemoryBarrierMask::FramebufferBarrierBit));
   GL_ASSERT(api::blitNamedFramebuffer(getHandle(),
@@ -117,7 +117,7 @@ void Framebuffer::blit(const Framebuffer& target, api::BlitFramebufferFilter fil
                                       filter));
 }
 
-void Framebuffer::blit(const glm::ivec2& backbufferSize, api::BlitFramebufferFilter filter)
+void Framebuffer::blit(const glm::ivec2& backbufferSize, const api::BlitFramebufferFilter filter) const
 {
   GL_ASSERT(api::blitNamedFramebuffer(getHandle(),
                                       0,
@@ -148,6 +148,6 @@ gslu::nn_shared<Framebuffer> FrameBufferBuilder::build(const std::string_view& l
   }
 
   m_renderState.setViewport(size);
-  return gsl::make_shared<Framebuffer>(std::move(m_attachments), label, std::move(m_renderState), size);
+  return gsl_lite::make_shared<Framebuffer>(std::move(m_attachments), label, std::move(m_renderState), size);
 }
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/framebuffer.h b/src/soglb/gl/framebuffer.h
index 580bcb0fe..d0b809a23 100644
--- a/src/soglb/gl/framebuffer.h
+++ b/src/soglb/gl/framebuffer.h
@@ -19,7 +19,6 @@ class TextureAttachment final
 {
   friend Framebuffer;
 
-private:
   gslu::nn_shared<Texture> m_texture;
   int32_t m_level;
   glm::ivec2 m_size;
@@ -28,7 +27,7 @@ class TextureAttachment final
 
 public:
   template<typename PixelT>
-  explicit TextureAttachment(const gslu::nn_shared<Texture2D<PixelT>>& texture, int32_t level = 0)
+  explicit TextureAttachment(const gslu::nn_shared<Texture2D<PixelT>>& texture, const int32_t level = 0)
       : m_texture{texture}
       , m_level{level}
       , m_size{texture->size()}
@@ -36,7 +35,7 @@ class TextureAttachment final
   }
 
   template<typename PixelT>
-  explicit TextureAttachment(const gslu::nn_shared<TextureDepth<PixelT>>& texture, int32_t level = 0)
+  explicit TextureAttachment(const gslu::nn_shared<TextureDepth<PixelT>>& texture, const int32_t level = 0)
       : m_texture{texture}
       , m_level{level}
       , m_size{texture->size()}
@@ -75,14 +74,14 @@ class Framebuffer final : public BindableResource<api::ObjectIdentifier::Framebu
     return m_renderState;
   }
 
-  void blit(const Framebuffer& target, api::BlitFramebufferFilter filter = api::BlitFramebufferFilter::Nearest);
+  void blit(const Framebuffer& target, api::BlitFramebufferFilter filter = api::BlitFramebufferFilter::Nearest) const;
 
-  void blit(const glm::ivec2& backbufferSize, api::BlitFramebufferFilter filter = api::BlitFramebufferFilter::Nearest);
+  void blit(const glm::ivec2& backbufferSize,
+            api::BlitFramebufferFilter filter = api::BlitFramebufferFilter::Nearest) const;
 };
 
 class FrameBufferBuilder final
 {
-private:
   Framebuffer::Attachments m_attachments;
   RenderState m_renderState;
 
@@ -93,7 +92,7 @@ class FrameBufferBuilder final
   FrameBufferBuilder& texture(api::FramebufferAttachment attachment,
                               const gslu::nn_shared<Texture2D<TPixel>>& texture,
                               int32_t level = 0,
-                              bool alphaBlend = true)
+                              const bool alphaBlend = true)
   {
     m_attachments.emplace_back(std::make_shared<TextureAttachment>(texture, level), attachment);
     if(attachment >= api::FramebufferAttachment::ColorAttachment0
diff --git a/src/soglb/gl/glad_init.cpp b/src/soglb/gl/glad_init.cpp
index 4dec0f8af..6366ba74b 100644
--- a/src/soglb/gl/glad_init.cpp
+++ b/src/soglb/gl/glad_init.cpp
@@ -8,7 +8,7 @@
 #include <boost/throw_exception.hpp>
 #include <cstdint>
 #include <cstdlib>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <stdexcept>
 #include <string_view>
 
@@ -17,7 +17,7 @@ using namespace gl;
 namespace
 {
 #ifdef SOGLB_DEBUGGING
-gsl::czstring glDebugSourceToString(const api::DebugSource src)
+gsl_lite::czstring glDebugSourceToString(const api::DebugSource src)
 {
   switch(src)
   {
@@ -39,7 +39,7 @@ gsl::czstring glDebugSourceToString(const api::DebugSource src)
   return "<unknown>";
 }
 
-gsl::czstring glDebugTypeToString(const api::DebugType type)
+gsl_lite::czstring glDebugTypeToString(const api::DebugType type)
 {
   switch(type)
   {
@@ -67,7 +67,7 @@ gsl::czstring glDebugTypeToString(const api::DebugType type)
   return "<unknown>";
 }
 
-gsl::czstring glDebugSeverityToString(const api::DebugSeverity severity)
+gsl_lite::czstring glDebugSeverityToString(const api::DebugSeverity severity)
 {
   switch(severity)
   {
@@ -90,7 +90,7 @@ void SOGLB_API debugCallback(const api::DebugSource source,
                              const uint32_t id,
                              const api::DebugSeverity severity,
                              const api::core::SizeType /*length*/,
-                             const gsl::czstring message,
+                             const gsl_lite::czstring message,
                              const void* /*userParam*/)
 {
   if(source == api::DebugSource::DebugSourceApplication
@@ -108,7 +108,7 @@ void SOGLB_API debugCallback(const api::DebugSource source,
                            << message;
 }
 
-const char* amdDebugSeverityToString(GLenum severity)
+const char* amdDebugSeverityToString(const GLenum severity)
 {
   switch(severity)
   {
@@ -123,7 +123,7 @@ const char* amdDebugSeverityToString(GLenum severity)
   }
 }
 
-const char* amdDebugCategoryToString(GLenum category)
+const char* amdDebugCategoryToString(const GLenum category)
 {
   switch(category)
   {
@@ -148,8 +148,10 @@ const char* amdDebugCategoryToString(GLenum category)
   }
 }
 
-void SOGLB_API amdDebugCallback(
-  GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar* message, GLvoid* /*userParam*/)
+void SOGLB_API amdDebugCallback(const GLuint id,
+                                const GLenum category,
+                                const GLenum severity,
+                                const GLsizei length, const GLchar* message, GLvoid* /*userParam*/)
 {
   if(category == GL_DEBUG_CATEGORY_APPLICATION_AMD)
     return;
@@ -244,4 +246,4 @@ float gl::getMaxAnisotropyLevel()
   float value = 0;
   GL_ASSERT(glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY, &value));
   return value;
-}
+}
\ No newline at end of file
diff --git a/src/soglb/gl/glassert.cpp b/src/soglb/gl/glassert.cpp
index 6e174fa51..12b23e73a 100644
--- a/src/soglb/gl/glassert.cpp
+++ b/src/soglb/gl/glassert.cpp
@@ -5,16 +5,16 @@
 #ifdef SOGLB_DEBUGGING
 #  include <boost/log/trivial.hpp>
 #  include <boost/throw_exception.hpp>
-#  include <gsl/gsl-lite.hpp>
+#  include <gsl-lite/gsl-lite.hpp>
 #  include <stdexcept>
 
-void gl::checkGlError(gsl::czstring code)
+void gl::checkGlError(const gsl_lite::czstring code)
 {
   const auto error = api::getError();
   if(error == api::ErrorCode::NoError)
     return;
 
-  gsl::czstring errStr;
+  gsl_lite::czstring errStr;
   switch(error)
   {
   case api::ErrorCode::InvalidEnum:
@@ -46,4 +46,4 @@ void gl::checkGlError(gsl::czstring code)
                            << code << "': " << errStr;
   BOOST_THROW_EXCEPTION(std::runtime_error("OpenGL error, see logs"));
 }
-#endif
+#endif
\ No newline at end of file
diff --git a/src/soglb/gl/glassert.h b/src/soglb/gl/glassert.h
index f22844d25..45703c6eb 100644
--- a/src/soglb/gl/glassert.h
+++ b/src/soglb/gl/glassert.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 #ifndef NDEBUG
 #  define SOGLB_DEBUGGING
@@ -9,9 +9,9 @@
 namespace gl
 {
 #ifdef SOGLB_DEBUGGING
-extern void checkGlError(gsl::czstring code);
+extern void checkGlError(gsl_lite::czstring code);
 #else
-inline void checkGlError(gsl::czstring /*code*/)
+inline void checkGlError(gsl_lite::czstring /*code*/)
 {
 }
 #endif
@@ -19,7 +19,7 @@ inline void checkGlError(gsl::czstring /*code*/)
 namespace detail
 {
 template<typename F>
-auto glAssertFn(F code, const gsl::czstring codeStr) -> decltype(code())
+auto glAssertFn(F code, const gsl_lite::czstring codeStr) -> decltype(code())
 {
   const auto result = code();
   checkGlError(codeStr);
diff --git a/src/soglb/gl/image.h b/src/soglb/gl/image.h
index 908bbc88c..a2e2fe311 100644
--- a/src/soglb/gl/image.h
+++ b/src/soglb/gl/image.h
@@ -8,7 +8,7 @@
 #include <cstring>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <vector>
 
 namespace gl
@@ -20,7 +20,7 @@ struct FastFill
 {
   static_assert(sizeof(T) == N, "Type size mismatch");
 
-  static void fill(const gsl::not_null<T*>& data, size_t n, const T& value)
+  static void fill(const gsl_lite::not_null<T*>& data, size_t n, const T& value)
   {
     std::fill_n(data.get(), n, value);
   }
@@ -31,7 +31,7 @@ struct FastFill<T, 1>
 {
   static_assert(sizeof(T) == 1, "Type size mismatch");
 
-  static void fill(const gsl::not_null<T*>& data, size_t n, const T& value)
+  static void fill(const gsl_lite::not_null<T*>& data, size_t n, const T& value)
   {
     std::memset(data.get(), value, n);
   }
@@ -42,7 +42,7 @@ struct FastFill<T, 2>
 {
   static_assert(sizeof(T) == 2, "Type size mismatch");
 
-  static void fill(const gsl::not_null<T*>& data, size_t n, const T& value)
+  static void fill(const gsl_lite::not_null<T*>& data, size_t n, const T& value)
   {
     std::wmemset(data.get(), value, n);
   }
@@ -53,10 +53,10 @@ struct FastFill<SRGBA8, 4>
 {
   static_assert(sizeof(SRGBA8) == 4, "Type size mismatch");
 
-  static void fill(const gsl::not_null<SRGBA8*>& data, const size_t n, const SRGBA8& value)
+  static void fill(const gsl_lite::not_null<SRGBA8*>& data, const size_t n, const SRGBA8& value)
   {
-    const auto scalar = value.channels[0];
-    if(scalar == value.channels[1] && scalar == value.channels[2] && scalar == value.channels[3])
+    if(const auto scalar = value.channels[0];
+       scalar == value.channels[1] && scalar == value.channels[2] && scalar == value.channels[3])
       std::memset(value_ptr(data->channels), scalar, n * 4u);
     else
       std::fill_n(data.get(), n, value);
@@ -64,7 +64,7 @@ struct FastFill<SRGBA8, 4>
 };
 
 template<typename T>
-void fill(const gsl::not_null<T*>& data, size_t n, const T& value)
+void fill(const gsl_lite::not_null<T*>& data, size_t n, const T& value)
 {
   FastFill<T, sizeof(T)>::fill(data, n, value);
 }
@@ -166,7 +166,7 @@ class Image
     if(xy.x < 0 || xy.x >= m_size.x || xy.y < 0 || xy.y >= m_size.y)
       return;
 
-    const auto o = gsl::narrow_cast<size_t>(xy.y * m_size.x + xy.x);
+    const auto o = gsl_lite::narrow_cast<size_t>(xy.y * m_size.x + xy.x);
 
     if(!blend)
     {
@@ -183,7 +183,7 @@ class Image
     if(xy.x < 0 || xy.x >= m_size.x || xy.y < 0 || xy.y >= m_size.y)
       return;
 
-    const auto o = gsl::narrow_cast<size_t>(xy.y * m_size.x + xy.x);
+    const auto o = gsl_lite::narrow_cast<size_t>(xy.y * m_size.x + xy.x);
 
     m_data[o] = pixel;
   }
@@ -201,7 +201,7 @@ class Image
   void fill(const StorageType& color)
   {
     if(!m_data.empty())
-      detail::fill(gsl::not_null{m_data.data()}, m_data.size(), color);
+      detail::fill(gsl_lite::not_null{m_data.data()}, m_data.size(), color);
   }
 
 private:
diff --git a/src/soglb/gl/pixel.h b/src/soglb/gl/pixel.h
index 8b654c86e..0ad778e5f 100644
--- a/src/soglb/gl/pixel.h
+++ b/src/soglb/gl/pixel.h
@@ -31,7 +31,7 @@ struct alignas(Alignment) Pixel
 
   static_assert(_Channels > 0, "Pixel must contain at least one channel");
 
-  using Self = Pixel<T, _Channels, _PixelFormat, _SizedInternalFormat, _Premultiplied, Alignment>;
+  using Self = Pixel;
 
   using Type = T;
 
@@ -40,7 +40,7 @@ struct alignas(Alignment) Pixel
   static constexpr api::SizedInternalFormat SizedInternalFormat = _SizedInternalFormat;
   static constexpr api::PixelType PixelType = ::gl::PixelType<T>;
   static constexpr bool Premultiplied = _Premultiplied;
-  using Vec = glm::vec<Channels, Type, glm::qualifier::defaultp>;
+  using Vec = glm::vec<Channels, Type>;
 
   Vec channels;
 
@@ -102,23 +102,23 @@ template<typename T,
          // NOLINTNEXTLINE(bugprone-reserved-identifier)
          bool _Premultiplied,
          size_t Alignment>
-auto imix(const Pixel<T, _Channels, _PixelFormat, _SizedInternalFormat, _Premultiplied, Alignment>& lhs,
-          const Pixel<T, _Channels, _PixelFormat, _SizedInternalFormat, _Premultiplied, Alignment>& rhs,
-          U bias, // NOLINT(*-easily-swappable-parameters)
-          U biasMax = std::numeric_limits<U>::max())
-  -> std::enable_if_t<std::is_unsigned_v<T> == std::is_unsigned_v<U>, // lgtm [cpp/comparison-of-identical-expressions]
-                      Pixel<T, _Channels, _PixelFormat, _SizedInternalFormat, _Premultiplied, Alignment>>
+Pixel<T, _Channels, _PixelFormat, _SizedInternalFormat, _Premultiplied, Alignment>
+  imix(const Pixel<T, _Channels, _PixelFormat, _SizedInternalFormat, _Premultiplied, Alignment>& lhs,
+       const Pixel<T, _Channels, _PixelFormat, _SizedInternalFormat, _Premultiplied, Alignment>& rhs,
+       U alpha,
+       // NOLINT(*-easily-swappable-parameters)
+       U biasMax = std::numeric_limits<U>::max()) requires(std::is_unsigned_v<T> == std::is_unsigned_v<U>)
 {
-  if(bias >= biasMax)
+  if(alpha >= biasMax)
     return rhs;
-  else if(bias <= 0)
+  else if(alpha <= 0)
     return lhs;
 
-  const auto invBias = biasMax - bias;
+  const auto invBias = biasMax - alpha;
   auto tmp = lhs;
   for(glm::length_t i = 0; i < _Channels; ++i)
   {
-    tmp.channels[i] = static_cast<T>(lhs.channels[i] * invBias / biasMax + rhs.channels[i] * bias / biasMax);
+    tmp.channels[i] = static_cast<T>(lhs.channels[i] * invBias / biasMax + rhs.channels[i] * alpha / biasMax);
   }
   return tmp;
 }
@@ -138,6 +138,12 @@ Pixel<T, 4, _PixelFormat, _SizedInternalFormat, _Premultiplied, Alignment>
   return imix(lhs, rhs, rhs.channels[3]);
 }
 
+template<typename T>
+using RGBA = Pixel<T, 4, api::PixelFormat::Rgba, RgbaSizedInternalFormat<T>, false, 4>;
+using RGBA8 = RGBA<uint8_t>;
+using RGBA16F = RGBA<api::core::Half>;
+using RGBA32F = RGBA<float>;
+
 template<typename T>
 using SRGBA = Pixel<T, 4, api::PixelFormat::Rgba, SrgbaSizedInternalFormat<T>, false, 4>;
 using SRGBA8 = SRGBA<uint8_t>;
@@ -177,13 +183,13 @@ constexpr T premultiply(T value, T alpha) noexcept
   return value * alpha / std::numeric_limits<T>::max();
 }
 
-constexpr float premultiply(float value, float alpha) noexcept
+constexpr float premultiply(const float value, const float alpha) noexcept
 {
   return value * alpha;
 }
 } // namespace detail
 
-constexpr PremultipliedSRGBA8 premultiply(const SRGBA8& color)
+inline PremultipliedSRGBA8 premultiply(const SRGBA8& color)
 {
   return PremultipliedSRGBA8{
     detail::premultiply(color.channels[0], color.channels[3]),
@@ -193,7 +199,7 @@ constexpr PremultipliedSRGBA8 premultiply(const SRGBA8& color)
   };
 }
 
-constexpr glm::vec4 premultiply(const glm::vec4& color)
+inline glm::vec4 premultiply(const glm::vec4& color)
 {
   return glm::vec4{
     detail::premultiply(color[0], color[3]),
@@ -211,7 +217,7 @@ struct ScalarDepth final
 
   using Type = T;
 
-  static constexpr api::PixelFormat PixelFormat = api::PixelFormat::DepthComponent;
+  static constexpr auto PixelFormat = api::PixelFormat::DepthComponent;
   static constexpr api::PixelType PixelType = ::gl::PixelType<T>;
   static constexpr auto InternalFormat = DepthInternalFormat<T>;
 
diff --git a/src/soglb/gl/program.cpp b/src/soglb/gl/program.cpp
index 3912a6af0..25eeb76a9 100644
--- a/src/soglb/gl/program.cpp
+++ b/src/soglb/gl/program.cpp
@@ -10,7 +10,7 @@
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <optional>
 #include <string>
 #include <utility>
@@ -73,7 +73,7 @@ void Uniform::set(const std::vector<glm::mat4>& values)
     *m_program,
     // NOLINTNEXTLINE(*-unchecked-optional-access)
     *getLocation(),
-    gsl::narrow<api::core::SizeType>(values.size()),
+    gsl_lite::narrow<api::core::SizeType>(values.size()),
     false,
     reinterpret_cast<const float*>(values.data()) // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
     ));
@@ -124,7 +124,7 @@ void Uniform::set(const std::vector<glm::vec2>& values)
     *m_program,
     // NOLINTNEXTLINE(*-unchecked-optional-access)
     *getLocation(),
-    gsl::narrow<api::core::SizeType>(values.size()),
+    gsl_lite::narrow<api::core::SizeType>(values.size()),
     reinterpret_cast<const float*>(values.data()) // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
     ));
 }
@@ -141,7 +141,7 @@ void Uniform::set(const std::vector<glm::vec3>& values)
     *m_program,
     // NOLINTNEXTLINE(*-unchecked-optional-access)
     *getLocation(),
-    gsl::narrow<api::core::SizeType>(values.size()),
+    gsl_lite::narrow<api::core::SizeType>(values.size()),
     reinterpret_cast<const float*>(values.data()) // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
     ));
 }
@@ -158,7 +158,7 @@ void Uniform::set(const std::vector<glm::vec4>& values)
     *m_program,
     // NOLINTNEXTLINE(*-unchecked-optional-access)
     *getLocation(),
-    gsl::narrow<api::core::SizeType>(values.size()),
+    gsl_lite::narrow<api::core::SizeType>(values.size()),
     reinterpret_cast<const float*>(values.data()) // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
     ));
 }
@@ -195,7 +195,7 @@ uint32_t Program::getActiveResourceCount(const api::ProgramInterface what) const
 {
   int32_t n = 0;
   GL_ASSERT(api::getProgramInterface(getHandle(), what, api::ProgramInterfacePName::ActiveResources, &n));
-  return gsl::narrow<uint32_t>(n);
+  return gsl_lite::narrow<uint32_t>(n);
 }
 
 std::vector<ProgramInput> Program::getInputs() const
@@ -222,4 +222,4 @@ std::vector<UniformBlock> Program::getUniformBlocks() const
 {
   return getInputs<UniformBlock>();
 }
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/program.h b/src/soglb/gl/program.h
index aef2e0086..1ab97fd56 100644
--- a/src/soglb/gl/program.h
+++ b/src/soglb/gl/program.h
@@ -15,7 +15,7 @@
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <limits>
 #include <optional>
@@ -39,9 +39,9 @@ class ProgramInterface
   explicit ProgramInterface(const Program& program, uint32_t index);
   virtual ~ProgramInterface() = default;
 
-  ProgramInterface(const ProgramInterface<_Type>& rhs) = default;
+  ProgramInterface(const ProgramInterface& rhs) = default;
 
-  ProgramInterface<_Type>& operator=(ProgramInterface<_Type>&& rhs) noexcept
+  ProgramInterface& operator=(ProgramInterface&& rhs) noexcept
   {
     m_name = std::move(rhs.m_name);
     return *this;
@@ -70,9 +70,9 @@ class LocatableProgramInterface : public ProgramInterface<_Type>
   {
   }
 
-  LocatableProgramInterface(const LocatableProgramInterface<_Type>& rhs) = default;
+  LocatableProgramInterface(const LocatableProgramInterface& rhs) = default;
 
-  LocatableProgramInterface<_Type>& operator=(LocatableProgramInterface<_Type>&& rhs) noexcept
+  LocatableProgramInterface& operator=(LocatableProgramInterface&& rhs) noexcept
   {
     m_location = std::exchange(rhs.m_location, std::nullopt);
     ProgramInterface<_Type>::operator=(std::move(rhs));
@@ -105,13 +105,13 @@ class ProgramBlock final : public ProgramInterface<_Type>
     gsl_Ensures(m_binding.has_value());
   }
 
-  ProgramBlock(ProgramBlock<_Type, _Target>&& rhs) noexcept
+  ProgramBlock(ProgramBlock&& rhs) noexcept
       : ProgramInterface<_Type>{std::move(rhs)}
       , m_binding{std::exchange(rhs.m_binding, std::nullopt)}
   {
   }
 
-  ProgramBlock<_Type, _Target>& operator=(ProgramBlock<_Type, _Target>&& rhs) noexcept
+  ProgramBlock& operator=(ProgramBlock&& rhs) noexcept
   {
     ProgramInterface<_Type>::operator=(std::move(rhs));
     m_binding = std::exchange(rhs.m_binding, std::nullopt);
@@ -127,11 +127,10 @@ class ProgramBlock final : public ProgramInterface<_Type>
 
   template<typename T, api::BufferTarget LazyTarget = _Target>
   // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-  auto bindRange(const Buffer<T, _Target>& buffer, size_t start, size_t n)
-    -> std::enable_if_t<
-      LazyTarget == api::BufferTarget::AtomicCounterBuffer || LazyTarget == api::BufferTarget::TransformFeedbackBuffer
-        || LazyTarget == api::BufferTarget::UniformBuffer || LazyTarget == api::BufferTarget::ShaderStorageBuffer,
-      void>
+  void bindRange(const Buffer<T, _Target>& buffer, size_t start, const size_t n)
+    requires(LazyTarget == api::BufferTarget::AtomicCounterBuffer
+             || LazyTarget == api::BufferTarget::TransformFeedbackBuffer
+             || LazyTarget == api::BufferTarget::UniformBuffer || LazyTarget == api::BufferTarget::ShaderStorageBuffer)
   {
     gsl_Expects(start < buffer.size());
     gsl_Expects(start + n <= buffer.size());
@@ -160,7 +159,7 @@ class Uniform final : public LocatableProgramInterface<api::ProgramInterface::Un
   Uniform& operator=(Uniform&& rhs) noexcept;
 
   template<typename T>
-  std::enable_if_t<std::is_trivial_v<T>, void> set(const T& value)
+  void set(const T& value) requires(std::is_trivial_v<T>)
   {
     gsl_Expects(m_program.has_value());
     gsl_Expects(getLocation().has_value());
@@ -174,7 +173,7 @@ class Uniform final : public LocatableProgramInterface<api::ProgramInterface::Un
     gsl_Expects(m_program.has_value());
     if(changeValue(values))
       GL_ASSERT(api::programUniform1(
-        *m_program, getLocation(), gsl::narrow<api::core::SizeType>(values.size()), values.data()));
+        *m_program, getLocation(), gsl_lite::narrow<api::core::SizeType>(values.size()), values.data()));
   }
 
   template<typename T, size_t N>
@@ -183,7 +182,7 @@ class Uniform final : public LocatableProgramInterface<api::ProgramInterface::Un
     gsl_Expects(m_program.has_value());
     if(changeValue(std::vector{values.begin(), values.end()}))
       GL_ASSERT(api::programUniform1(
-        *m_program, getLocation(), gsl::narrow<api::core::SizeType>(values.size()), values.data()));
+        *m_program, getLocation(), gsl_lite::narrow<api::core::SizeType>(values.size()), values.data()));
   }
 
   void set(const glm::mat3& value);
@@ -217,13 +216,6 @@ class Uniform final : public LocatableProgramInterface<api::ProgramInterface::Un
     GL_ASSERT(api::programUniformHandle(*m_program, *getLocation(), textureHandle->getHandle()));
   }
 
-  // NOLINTNEXTLINE(bugprone-reserved-identifier)
-  template<typename TTexture>
-  void set(const gsl::span<const gslu::nn_shared<TextureHandle<TTexture>>>& textureHandles)
-  {
-    setTextures(textureHandles.begin(), textureHandles.end());
-  }
-
 private:
   std::optional<int32_t> m_size;
   std::optional<uint32_t> m_program;
@@ -274,7 +266,7 @@ class Program final : public Resource<api::ObjectIdentifier::Program>
                  label}
   {
     (...,
-     [this, &shaders]()
+     [this, &shaders]
      {
        GL_ASSERT(api::attachShader(getHandle(), shaders.getHandle()));
      }());
@@ -319,8 +311,12 @@ ProgramInterface<_Type>::ProgramInterface(const Program& program, const uint32_t
   const auto nameLength = getProperty(program, index, api::ProgramResourceProperty::NameLength);
   gsl_Assert(nameLength > 0);
   std::vector<char> nameData(nameLength, 0);
-  GL_ASSERT(api::getProgramResourceName(
-    program.getHandle(), Type, index, gsl::narrow<api::core::SizeType>(nameData.size()), nullptr, nameData.data()));
+  GL_ASSERT(api::getProgramResourceName(program.getHandle(),
+                                        Type,
+                                        index,
+                                        gsl_lite::narrow<api::core::SizeType>(nameData.size()),
+                                        nullptr,
+                                        nameData.data()));
   m_name = nameData.data();
 }
 
@@ -331,16 +327,16 @@ int32_t ProgramInterface<_Type>::getProperty(const Program& program,
                                              const api::ProgramResourceProperty what)
 {
   constexpr int32_t NumProperties = 1;
-  const std::array<api::ProgramResourceProperty, NumProperties> properties{what};
+  const std::array properties{what};
   std::array<int32_t, 1> values{};
   GL_ASSERT(api::getProgramResource(program.getHandle(),
                                     Type,
                                     index,
                                     NumProperties,
                                     properties.data(),
-                                    gsl::narrow_cast<api::core::SizeType>(values.size()),
+                                    gsl_lite::narrow_cast<api::core::SizeType>(values.size()),
                                     nullptr,
                                     values.data()));
   return values[0];
 }
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/renderstate.cpp b/src/soglb/gl/renderstate.cpp
index 309505913..5d4eee340 100644
--- a/src/soglb/gl/renderstate.cpp
+++ b/src/soglb/gl/renderstate.cpp
@@ -5,12 +5,12 @@
 
 #include <cstdint>
 #include <glm/common.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace gl
 {
 // NOLINTNEXTLINE(misc-no-recursion)
-inline RenderState& getCurrentState(bool reset = false)
+inline RenderState& getCurrentState(const bool reset = false)
 {
   static RenderState currentState{};
   static bool initialized = false;
@@ -18,7 +18,7 @@ inline RenderState& getCurrentState(bool reset = false)
   if(!initialized || reset)
   {
     currentState = RenderState{};
-    auto oldWanted = RenderState::getWantedState();
+    const auto oldWanted = RenderState::getWantedState();
     RenderState::resetWantedState();
     initialized = true;
     RenderState::getWantedState() = oldWanted;
@@ -171,10 +171,19 @@ void RenderState::apply() const
     const auto& [xy, size] = *getCurrentState().m_scissorRegion;
     const auto screenXy = glm::floor(vp * (xy + glm::vec2{1, 1}) * 0.5f);
     const auto screenSize = glm::ceil(vp * size * 0.5f);
-    GL_ASSERT(api::scissor(gsl::narrow_cast<int32_t>(screenXy.x),
-                           gsl::narrow_cast<int32_t>(screenXy.y),
-                           gsl::narrow_cast<api::core::SizeType>(screenSize.x),
-                           gsl::narrow_cast<api::core::SizeType>(screenSize.y)));
+    GL_ASSERT(api::scissor(gsl_lite::narrow_cast<int32_t>(screenXy.x),
+                           gsl_lite::narrow_cast<int32_t>(screenXy.y),
+                           gsl_lite::narrow_cast<api::core::SizeType>(screenSize.x),
+                           gsl_lite::narrow_cast<api::core::SizeType>(screenSize.y)));
+  }
+  if(RS_CHANGED(m_programPointSizeEnabled))
+  {
+    gsl_Assert(m_programPointSizeEnabled.has_value());
+    if(m_programPointSizeEnabled.value())
+      GL_ASSERT(api::enable(api::EnableCap::ProgramPointSize));
+    else
+      GL_ASSERT(api::disable(api::EnableCap::ProgramPointSize));
+    getCurrentState().m_programPointSizeEnabled = m_programPointSizeEnabled;
   }
   if(RS_CHANGED(m_polygonOffsetFillEnabled) || RS_CHANGED(m_polygonOffset))
   {
@@ -220,6 +229,7 @@ void RenderState::merge(const RenderState& other)
   MERGE_OPT(m_lineSmooth);
   MERGE_OPT(m_scissorTest);
   MERGE_OPT(m_scissorRegion);
+  MERGE_OPT(m_programPointSizeEnabled);
   MERGE_OPT(m_polygonOffsetFillEnabled);
   MERGE_OPT(m_polygonOffset);
 #undef MERGE_OPT
@@ -260,6 +270,7 @@ RenderState RenderState::getDefaults()
     defaults.setLineSmooth(true);
     defaults.setScissorTest(false);
     defaults.setScissorRegion({0, 0}, {0, 0});
+    defaults.setProgramPointSize(false);
     defaults.setPolygonOffsetFill(false);
     defaults.setPolygonOffset(0, 0);
   }
@@ -271,4 +282,4 @@ void RenderState::reset()
   resetWantedState();
   getCurrentState(true);
 }
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/renderstate.h b/src/soglb/gl/renderstate.h
index 8a9a0ae89..6aa10e3ce 100644
--- a/src/soglb/gl/renderstate.h
+++ b/src/soglb/gl/renderstate.h
@@ -123,6 +123,11 @@ class RenderState final
 
   void merge(const RenderState& other);
 
+  void setProgramPointSize(const bool enabled)
+  {
+    m_programPointSizeEnabled = enabled;
+  }
+
   void setPolygonOffsetFill(bool enabled)
   {
     m_polygonOffsetFillEnabled = enabled;
@@ -158,6 +163,7 @@ class RenderState final
   std::optional<bool> m_scissorTest;
   std::optional<std::tuple<glm::vec2, glm::vec2>> m_scissorRegion;
   std::optional<bool> m_polygonOffsetFillEnabled;
+  std::optional<bool> m_programPointSizeEnabled;
   std::optional<std::tuple<float, float>> m_polygonOffset;
 };
 } // namespace gl
diff --git a/src/soglb/gl/resource.h b/src/soglb/gl/resource.h
index f6f2e4396..2e8b296c9 100644
--- a/src/soglb/gl/resource.h
+++ b/src/soglb/gl/resource.h
@@ -64,7 +64,7 @@ class Resource
     BOOST_ASSERT(maxLabelLength > 0);
 
     GL_ASSERT(api::objectLabel(
-      Identifier, m_handle, std::min(maxLabelLength, gsl::narrow<int32_t>(label.size())), label.data()));
+      Identifier, m_handle, std::min(maxLabelLength, gsl_lite::narrow<int32_t>(label.size())), label.data()));
   }
 
 private:
@@ -72,4 +72,4 @@ class Resource
   Allocator m_allocator;
   Deleter m_deleter;
 };
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/sampler.h b/src/soglb/gl/sampler.h
index f3036aa86..548391185 100644
--- a/src/soglb/gl/sampler.h
+++ b/src/soglb/gl/sampler.h
@@ -7,7 +7,7 @@
 #include <cstdint>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <string_view>
 
@@ -34,7 +34,7 @@ class Sampler final
 
     if(!label.empty())
       GL_ASSERT(api::objectLabel(
-        api::ObjectIdentifier::Sampler, m_handle, gsl::narrow<api::core::SizeType>(label.size()), label.data()));
+        api::ObjectIdentifier::Sampler, m_handle, gsl_lite::narrow<api::core::SizeType>(label.size()), label.data()));
   }
 
   ~Sampler()
@@ -99,8 +99,8 @@ class Sampler final
 } // namespace gl
 
 template<typename... Args>
-inline gslu::nn_unique<gl::Sampler> operator|(gslu::nn_unique<gl::Sampler>&& sampler,
-                                              const gl::detail::ArgsHolder<Args...>& setter)
+gslu::nn_unique<gl::Sampler> operator|(gslu::nn_unique<gl::Sampler>&& sampler,
+                                       const gl::detail::ArgsHolder<Args...>& setter)
 {
   std::apply(
     [&sampler](const Args&... args)
@@ -109,4 +109,4 @@ inline gslu::nn_unique<gl::Sampler> operator|(gslu::nn_unique<gl::Sampler>&& sam
     },
     setter.args);
   return std::move(sampler);
-}
+}
\ No newline at end of file
diff --git a/src/soglb/gl/shader.cpp b/src/soglb/gl/shader.cpp
index d3f3e08fe..bf8847f70 100644
--- a/src/soglb/gl/shader.cpp
+++ b/src/soglb/gl/shader.cpp
@@ -11,7 +11,7 @@
 #include <cstdint>
 #include <filesystem>
 #include <fstream>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <ios>
 #include <iterator>
 #include <set>
@@ -37,7 +37,7 @@ std::string readAll(const std::filesystem::path& filePath)
   return std::string{std::istream_iterator<char>{stream}, std::istream_iterator<char>{}};
 }
 
-std::string replaceDefines(const std::vector<std::string>& defines, bool isInput)
+std::string replaceDefines(const std::vector<std::string>& defines, const bool isInput)
 {
   std::string out;
   if(!defines.empty())
@@ -106,7 +106,7 @@ void replaceIncludes(const std::filesystem::path& filepath,
       // File path to include and 'stitch' in the value in the quotes to the file path and source it.
       const size_t len = endQuote - startQuote;
       const auto includePath = filepath.parent_path() / std::filesystem::path{source.substr(startQuote, len)};
-      if(included.count(includePath) > 0)
+      if(included.contains(includePath))
       {
         continue;
       }
@@ -133,11 +133,11 @@ void replaceIncludes(const std::filesystem::path& filepath,
 
 // NOLINTNEXTLINE(bugprone-reserved-identifier)
 template<api::ShaderType _Type>
-Shader<_Type>::Shader(const gsl::span<gsl::czstring>& src, const std::string_view& label)
+Shader<_Type>::Shader(const gsl_lite::span<gsl_lite::czstring>& src, const std::string_view& label)
     : m_handle{GL_ASSERT_FN(api::createShader(Type))}
 {
   gsl_Ensures(m_handle != 0);
-  GL_ASSERT(api::shaderSource(m_handle, gsl::narrow<api::core::SizeType>(src.size()), src.data(), nullptr));
+  GL_ASSERT(api::shaderSource(m_handle, gsl_lite::narrow<api::core::SizeType>(src.size()), src.data(), nullptr));
   GL_ASSERT(api::compileShader(m_handle));
 
   if(const auto log = getInfoLog(); !log.empty())
@@ -154,7 +154,7 @@ Shader<_Type>::Shader(const gsl::span<gsl::czstring>& src, const std::string_vie
   if(!label.empty())
   {
     GL_ASSERT(api::objectLabel(
-      api::ObjectIdentifier::Shader, m_handle, gsl::narrow<api::core::SizeType>(label.size()), label.data()));
+      api::ObjectIdentifier::Shader, m_handle, gsl_lite::narrow<api::core::SizeType>(label.size()), label.data()));
   }
 }
 
@@ -171,7 +171,7 @@ std::string Shader<_Type>::getInfoLog() const
   if(length <= 0)
     return {};
 
-  std::vector<char> infoLog(length, '\0');
+  std::vector infoLog(length, '\0');
   GL_ASSERT(api::getShaderInfoLog(m_handle, length, nullptr, infoLog.data()));
   infoLog.back() = '\0';
   return infoLog.data();
@@ -185,7 +185,7 @@ Shader<_Type> Shader<_Type>::create(const std::filesystem::path& sourcePath,
                                     const std::string_view& label)
 {
   static constexpr size_t SHADER_SOURCE_LENGTH = 3;
-  std::array<gsl::czstring, SHADER_SOURCE_LENGTH> shaderSource{nullptr};
+  std::array<gsl_lite::czstring, SHADER_SOURCE_LENGTH> shaderSource{nullptr};
   shaderSource[0]
     = "#version 450 core\n"
       "#extension GL_ARB_bindless_texture : require\n"
@@ -203,7 +203,7 @@ Shader<_Type> Shader<_Type>::create(const std::filesystem::path& sourcePath,
   }
   shaderSource[2] = !sourcePath.empty() ? sourceStr.c_str() : source.c_str();
 
-  return Shader<_Type>{shaderSource, label};
+  return Shader{shaderSource, label};
 }
 
 // NOLINTNEXTLINE(bugprone-reserved-identifier)
diff --git a/src/soglb/gl/shader.h b/src/soglb/gl/shader.h
index 84b58f225..d6a574ebb 100644
--- a/src/soglb/gl/shader.h
+++ b/src/soglb/gl/shader.h
@@ -5,7 +5,7 @@
 
 #include <cstdint>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -19,7 +19,7 @@ class Shader final
 public:
   static constexpr api::ShaderType Type = _Type;
 
-  explicit Shader(const gsl::span<gsl::czstring>& src, const std::string_view& label);
+  explicit Shader(const gsl_lite::span<gsl_lite::czstring>& src, const std::string_view& label);
 
   Shader(const Shader&) = delete;
   Shader(Shader&&) = delete;
@@ -38,14 +38,14 @@ class Shader final
 
   [[nodiscard]] std::string getInfoLog() const;
 
-  [[nodiscard]] static Shader<_Type> create(const std::filesystem::path& sourcePath,
-                                            const std::vector<std::string>& defines,
-                                            const std::string_view& label);
+  [[nodiscard]] static Shader create(const std::filesystem::path& sourcePath,
+                                     const std::vector<std::string>& defines,
+                                     const std::string_view& label);
 
-  [[nodiscard]] static Shader<_Type> create(const std::filesystem::path& path,
-                                            const std::string& source,
-                                            const std::vector<std::string>& defines,
-                                            const std::string_view& label);
+  [[nodiscard]] static Shader create(const std::filesystem::path& sourcePath,
+                                     const std::string& source,
+                                     const std::vector<std::string>& defines,
+                                     const std::string_view& label);
 
 private:
   uint32_t m_handle;
diff --git a/src/soglb/gl/soglb_fwd.h b/src/soglb/gl/soglb_fwd.h
index 5ca779507..e4b91c68a 100644
--- a/src/soglb/gl/soglb_fwd.h
+++ b/src/soglb/gl/soglb_fwd.h
@@ -83,5 +83,4 @@ class VertexBuffer;
 class Window;
 template<typename T>
 class ElementArrayBuffer;
-class Font;
 } // namespace gl
diff --git a/src/soglb/gl/texture.h b/src/soglb/gl/texture.h
index a36ef9877..1634fb331 100644
--- a/src/soglb/gl/texture.h
+++ b/src/soglb/gl/texture.h
@@ -6,7 +6,7 @@
 #include <cstdint>
 #include <gl/glassert.h>
 #include <gl/resource.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string_view>
 #include <utility>
 
@@ -21,6 +21,7 @@ class Texture : public Resource<api::ObjectIdentifier::Texture>
   }
 
 public:
+  // ReSharper disable once CppMemberFunctionMayBeConst
   void generateMipmaps()
   {
     GL_ASSERT(gl::api::generateTextureMipmap(getHandle()));
@@ -50,7 +51,7 @@ class TextureImpl : public Texture
   static constexpr auto Target = _Target;
   using Pixel = _PixelT;
 
-  TextureImpl<_Target, _PixelT>& clear(const _PixelT& pixel, int level = 0)
+  TextureImpl& clear(const _PixelT& pixel, const int level = 0)
   {
     GL_ASSERT(api::clearTexImage(getHandle(), level, Pixel::PixelFormat, Pixel::PixelType, &pixel));
     return *this;
@@ -59,4 +60,4 @@ class TextureImpl : public Texture
 private:
   boost::container::flat_map<uint64_t, uint32_t> m_textureHandleReferences;
 };
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/texture2d.h b/src/soglb/gl/texture2d.h
index bfec5f623..b5993c994 100644
--- a/src/soglb/gl/texture2d.h
+++ b/src/soglb/gl/texture2d.h
@@ -5,7 +5,7 @@
 #include <boost/assert.hpp>
 #include <gl/glassert.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string_view>
 
 namespace gl
@@ -20,7 +20,7 @@ class Texture2D final : public TextureImpl<api::TextureTarget::Texture2d, _Pixel
   using TextureImpl<api::TextureTarget::Texture2d, _PixelT>::clear;
 
   explicit Texture2D(const glm::ivec2& size, const std::string_view& label)
-      : Texture2D<_PixelT>{size, 1, label}
+      : Texture2D{size, 1, label}
   {
   }
 
@@ -36,12 +36,12 @@ class Texture2D final : public TextureImpl<api::TextureTarget::Texture2d, _Pixel
       clear(Pixel{}, i);
   }
 
-  Texture2D<_PixelT>& assign(const gsl::span<const _PixelT>& data, int level = 0)
+  Texture2D& assign(const gsl_lite::span<const _PixelT>& data, int level = 0)
   {
     const int levelDiv = 1 << level;
     const auto sizeX = glm::max(1, m_size.x / levelDiv);
     const auto sizeY = glm::max(1, m_size.y / levelDiv);
-    gsl_Assert(gsl::narrow<size_t>(sizeX) * gsl::narrow<size_t>(sizeY) == data.size());
+    gsl_Assert(gsl_lite::narrow<size_t>(sizeX) * gsl_lite::narrow<size_t>(sizeY) == data.size());
 
     GL_ASSERT(api::textureSubImage2D(
       getHandle(), level, 0, 0, sizeX, sizeY, Pixel::PixelFormat, Pixel::PixelType, data.data()));
diff --git a/src/soglb/gl/texture2darray.h b/src/soglb/gl/texture2darray.h
index bb1c280fa..e6fe4b2f9 100644
--- a/src/soglb/gl/texture2darray.h
+++ b/src/soglb/gl/texture2darray.h
@@ -5,7 +5,7 @@
 #include <boost/assert.hpp>
 #include <gl/glassert.h>
 #include <glm/vec3.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string_view>
 
 namespace gl
@@ -31,13 +31,13 @@ class Texture2DArray final : public TextureImpl<api::TextureTarget::Texture2dArr
   }
 
   // NOLINTNEXTLINE(*-easily-swappable-parameters)
-  Texture2DArray<_PixelT>& assign(const gsl::span<const _PixelT>& data, int z, int level = 0)
+  Texture2DArray& assign(const gsl_lite::span<const _PixelT>& data, int z, int level = 0)
   {
     BOOST_ASSERT(z >= 0 && z < m_size.z);
 
     const int levelDiv = 1 << level;
     const auto size = glm::max(glm::ivec3{1, 1, 1}, m_size / levelDiv);
-    gsl_Assert(gsl::narrow_cast<size_t>(size.x) * gsl::narrow_cast<size_t>(size.y) == data.size());
+    gsl_Assert(gsl_lite::narrow_cast<size_t>(size.x) * gsl_lite::narrow_cast<size_t>(size.y) == data.size());
 
     GL_ASSERT(api::textureSubImage3D(
       getHandle(), level, 0, 0, z, size.x, size.y, 1, Pixel::PixelFormat, Pixel::PixelType, data.data()));
diff --git a/src/soglb/gl/texturehandle.h b/src/soglb/gl/texturehandle.h
index 42d28a2b5..400012e7f 100644
--- a/src/soglb/gl/texturehandle.h
+++ b/src/soglb/gl/texturehandle.h
@@ -6,7 +6,7 @@
 #include "texture.h"
 
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <type_traits>
 
@@ -17,13 +17,13 @@ template<typename TTexture>
 class TextureHandle final
 {
 public:
-  TextureHandle(const TextureHandle<TTexture>&) = delete;
-  TextureHandle(TextureHandle<TTexture>&&) = delete;
-  void operator=(const TextureHandle<TTexture>&) = delete;
-  void operator=(TextureHandle<TTexture>&&) = delete;
+  TextureHandle(const TextureHandle&) = delete;
+  TextureHandle(TextureHandle&&) = delete;
+  void operator=(const TextureHandle&) = delete;
+  void operator=(TextureHandle&&) = delete;
 
   using Texture = TTexture;
-  static_assert(std::is_base_of_v<::gl::Texture, Texture>);
+  static_assert(std::is_base_of_v<gl::Texture, Texture>);
 
   explicit TextureHandle(gslu::nn_shared<Texture> texture, gslu::nn_unique<Sampler>&& sampler)
       : m_texture{std::move(texture)}
@@ -45,7 +45,7 @@ class TextureHandle final
   {
     if(--m_texture->m_textureHandleReferences[m_handle] == 0)
     {
-// #define NVIDIA_NSIGHT_HACK
+      // #define NVIDIA_NSIGHT_HACK
 #ifdef NVIDIA_NSIGHT_HACK
       api::makeTextureHandleNonResident(m_handle);
       api::getError();
@@ -75,4 +75,4 @@ class TextureHandle final
   gslu::nn_unique<Sampler> m_sampler;
   uint64_t m_handle;
 };
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/typetraits.h b/src/soglb/gl/typetraits.h
index c24c3ecd2..fb5063f68 100644
--- a/src/soglb/gl/typetraits.h
+++ b/src/soglb/gl/typetraits.h
@@ -20,57 +20,55 @@ struct InvalidValue
 template<typename>
 inline constexpr auto DrawElementsType = detail::InvalidValue{};
 template<>
-inline constexpr api::DrawElementsType DrawElementsType<uint8_t> = api::DrawElementsType::UnsignedByte;
+inline constexpr auto DrawElementsType<uint8_t> = api::DrawElementsType::UnsignedByte;
 template<>
-inline constexpr api::DrawElementsType DrawElementsType<uint16_t> = api::DrawElementsType::UnsignedShort;
+inline constexpr auto DrawElementsType<uint16_t> = api::DrawElementsType::UnsignedShort;
 template<>
-inline constexpr api::DrawElementsType DrawElementsType<uint32_t> = api::DrawElementsType::UnsignedInt;
+inline constexpr auto DrawElementsType<uint32_t> = api::DrawElementsType::UnsignedInt;
 
 template<typename>
 inline constexpr auto VertexAttribType = detail::InvalidValue{};
 template<>
-inline constexpr api::VertexAttribType VertexAttribType<uint8_t> = api::VertexAttribType::UnsignedByte;
+inline constexpr auto VertexAttribType<uint8_t> = api::VertexAttribType::UnsignedByte;
 template<>
-inline constexpr api::VertexAttribType VertexAttribType<uint16_t> = api::VertexAttribType::UnsignedShort;
+inline constexpr auto VertexAttribType<uint16_t> = api::VertexAttribType::UnsignedShort;
 template<>
-inline constexpr api::VertexAttribType VertexAttribType<uint32_t> = api::VertexAttribType::UnsignedInt;
+inline constexpr auto VertexAttribType<uint32_t> = api::VertexAttribType::UnsignedInt;
 template<>
-inline constexpr api::VertexAttribType VertexAttribType<int8_t> = api::VertexAttribType::Byte;
+inline constexpr auto VertexAttribType<int8_t> = api::VertexAttribType::Byte;
 template<>
-inline constexpr api::VertexAttribType VertexAttribType<int16_t> = api::VertexAttribType::Short;
+inline constexpr auto VertexAttribType<int16_t> = api::VertexAttribType::Short;
 template<>
-inline constexpr api::VertexAttribType VertexAttribType<int32_t> = api::VertexAttribType::Int;
+inline constexpr auto VertexAttribType<int32_t> = api::VertexAttribType::Int;
 template<>
-inline constexpr api::VertexAttribType VertexAttribType<float> = api::VertexAttribType::Float;
+inline constexpr auto VertexAttribType<float> = api::VertexAttribType::Float;
 template<>
-inline constexpr api::VertexAttribType VertexAttribType<api::core::Half> = api::VertexAttribType::HalfFloat;
+inline constexpr auto VertexAttribType<api::core::Half> = api::VertexAttribType::HalfFloat;
 template<int N>
-inline constexpr api::VertexAttribType VertexAttribType<glm::vec<N, float, glm::defaultp>>
-  = api::VertexAttribType::Float;
+inline constexpr auto VertexAttribType<glm::vec<N, float>> = api::VertexAttribType::Float;
 template<int C, int R>
-inline constexpr api::VertexAttribType VertexAttribType<glm::mat<C, R, float, glm::defaultp>>
-  = api::VertexAttribType::Float;
+inline constexpr auto VertexAttribType<glm::mat<C, R, float>> = api::VertexAttribType::Float;
 
 template<typename>
 inline constexpr auto PixelType = detail::InvalidValue{};
 template<>
-inline constexpr api::PixelType PixelType<uint8_t> = api::PixelType::UnsignedByte;
+inline constexpr auto PixelType<uint8_t> = api::PixelType::UnsignedByte;
 template<>
-inline constexpr api::PixelType PixelType<uint16_t> = api::PixelType::UnsignedShort;
+inline constexpr auto PixelType<uint16_t> = api::PixelType::UnsignedShort;
 template<>
-inline constexpr api::PixelType PixelType<uint32_t> = api::PixelType::UnsignedInt;
+inline constexpr auto PixelType<uint32_t> = api::PixelType::UnsignedInt;
 template<>
-inline constexpr api::PixelType PixelType<int8_t> = api::PixelType::Byte;
+inline constexpr auto PixelType<int8_t> = api::PixelType::Byte;
 template<>
-inline constexpr api::PixelType PixelType<int16_t> = api::PixelType::Short;
+inline constexpr auto PixelType<int16_t> = api::PixelType::Short;
 template<>
-inline constexpr api::PixelType PixelType<int32_t> = api::PixelType::Int;
+inline constexpr auto PixelType<int32_t> = api::PixelType::Int;
 template<>
-inline constexpr api::PixelType PixelType<float> = api::PixelType::Float;
+inline constexpr auto PixelType<float> = api::PixelType::Float;
 template<>
-inline constexpr api::PixelType PixelType<api::core::Half> = api::PixelType::HalfFloat;
+inline constexpr auto PixelType<api::core::Half> = api::PixelType::HalfFloat;
 template<int N>
-inline constexpr api::PixelType PixelType<glm::vec<N, float, glm::defaultp>> = api::PixelType::Float;
+inline constexpr auto PixelType<glm::vec<N, float>> = api::PixelType::Float;
 
 template<typename>
 inline constexpr auto ElementCount = detail::InvalidValue{};
@@ -91,9 +89,9 @@ inline constexpr api::core::SizeType ElementCount<float> = 1;
 template<>
 inline constexpr api::core::SizeType ElementCount<api::core::Half> = 1;
 template<int N>
-inline constexpr api::core::SizeType ElementCount<glm::vec<N, float, glm::defaultp>> = N;
+inline constexpr api::core::SizeType ElementCount<glm::vec<N, float>> = N;
 template<int C, int R>
-inline constexpr api::core::SizeType ElementCount<glm::mat<C, R, float, glm::defaultp>> = C * R;
+inline constexpr api::core::SizeType ElementCount<glm::mat<C, R, float>> = C * R;
 
 template<typename>
 inline constexpr auto SrgbaSizedInternalFormat = detail::InvalidValue{};
@@ -109,87 +107,87 @@ template<typename>
 inline constexpr auto RSizedInternalFormat = detail::InvalidValue{};
 
 template<>
-inline constexpr api::SizedInternalFormat SrgbaSizedInternalFormat<uint8_t> = api::SizedInternalFormat::Srgb8Alpha8;
+inline constexpr auto SrgbaSizedInternalFormat<uint8_t> = api::SizedInternalFormat::Srgb8Alpha8;
 template<>
-inline constexpr api::SizedInternalFormat SrgbSizedInternalFormat<uint8_t> = api::SizedInternalFormat::Srgb8;
+inline constexpr auto SrgbSizedInternalFormat<uint8_t> = api::SizedInternalFormat::Srgb8;
 template<>
-inline constexpr api::SizedInternalFormat RgbaSizedInternalFormat<uint8_t> = api::SizedInternalFormat::Rgba8;
+inline constexpr auto RgbaSizedInternalFormat<uint8_t> = api::SizedInternalFormat::Rgba8;
 template<>
-inline constexpr api::SizedInternalFormat RgbSizedInternalFormat<uint8_t> = api::SizedInternalFormat::Rgb8;
+inline constexpr auto RgbSizedInternalFormat<uint8_t> = api::SizedInternalFormat::Rgb8;
 template<>
-inline constexpr api::SizedInternalFormat RgSizedInternalFormat<uint8_t> = api::SizedInternalFormat::Rg8;
+inline constexpr auto RgSizedInternalFormat<uint8_t> = api::SizedInternalFormat::Rg8;
 template<>
-inline constexpr api::SizedInternalFormat RSizedInternalFormat<uint8_t> = api::SizedInternalFormat::R8;
+inline constexpr auto RSizedInternalFormat<uint8_t> = api::SizedInternalFormat::R8;
 
 template<>
-inline constexpr api::SizedInternalFormat RgbaSizedInternalFormat<uint16_t> = api::SizedInternalFormat::Rgba16ui;
+inline constexpr auto RgbaSizedInternalFormat<uint16_t> = api::SizedInternalFormat::Rgba16ui;
 template<>
-inline constexpr api::SizedInternalFormat RgbSizedInternalFormat<uint16_t> = api::SizedInternalFormat::Rgb16ui;
+inline constexpr auto RgbSizedInternalFormat<uint16_t> = api::SizedInternalFormat::Rgb16ui;
 template<>
-inline constexpr api::SizedInternalFormat RgSizedInternalFormat<uint16_t> = api::SizedInternalFormat::Rg16ui;
+inline constexpr auto RgSizedInternalFormat<uint16_t> = api::SizedInternalFormat::Rg16ui;
 template<>
-inline constexpr api::SizedInternalFormat RSizedInternalFormat<uint16_t> = api::SizedInternalFormat::R16ui;
+inline constexpr auto RSizedInternalFormat<uint16_t> = api::SizedInternalFormat::R16ui;
 
 template<>
-inline constexpr api::SizedInternalFormat RgbaSizedInternalFormat<uint32_t> = api::SizedInternalFormat::Rgba32ui;
+inline constexpr auto RgbaSizedInternalFormat<uint32_t> = api::SizedInternalFormat::Rgba32ui;
 template<>
-inline constexpr api::SizedInternalFormat RgbSizedInternalFormat<uint32_t> = api::SizedInternalFormat::Rgb32ui;
+inline constexpr auto RgbSizedInternalFormat<uint32_t> = api::SizedInternalFormat::Rgb32ui;
 template<>
-inline constexpr api::SizedInternalFormat RgSizedInternalFormat<uint32_t> = api::SizedInternalFormat::Rg32ui;
+inline constexpr auto RgSizedInternalFormat<uint32_t> = api::SizedInternalFormat::Rg32ui;
 template<>
-inline constexpr api::SizedInternalFormat RSizedInternalFormat<uint32_t> = api::SizedInternalFormat::R32ui;
+inline constexpr auto RSizedInternalFormat<uint32_t> = api::SizedInternalFormat::R32ui;
 
 template<>
-inline constexpr api::SizedInternalFormat RgbaSizedInternalFormat<int8_t> = api::SizedInternalFormat::Rgba8i;
+inline constexpr auto RgbaSizedInternalFormat<int8_t> = api::SizedInternalFormat::Rgba8i;
 template<>
-inline constexpr api::SizedInternalFormat RgbSizedInternalFormat<int8_t> = api::SizedInternalFormat::Rgb8i;
+inline constexpr auto RgbSizedInternalFormat<int8_t> = api::SizedInternalFormat::Rgb8i;
 template<>
-inline constexpr api::SizedInternalFormat RgSizedInternalFormat<int8_t> = api::SizedInternalFormat::Rg8i;
+inline constexpr auto RgSizedInternalFormat<int8_t> = api::SizedInternalFormat::Rg8i;
 template<>
-inline constexpr api::SizedInternalFormat RSizedInternalFormat<int8_t> = api::SizedInternalFormat::R8i;
+inline constexpr auto RSizedInternalFormat<int8_t> = api::SizedInternalFormat::R8i;
 
 template<>
-inline constexpr api::SizedInternalFormat RgbaSizedInternalFormat<int16_t> = api::SizedInternalFormat::Rgba16i;
+inline constexpr auto RgbaSizedInternalFormat<int16_t> = api::SizedInternalFormat::Rgba16i;
 template<>
-inline constexpr api::SizedInternalFormat RgbSizedInternalFormat<int16_t> = api::SizedInternalFormat::Rgb16i;
+inline constexpr auto RgbSizedInternalFormat<int16_t> = api::SizedInternalFormat::Rgb16i;
 template<>
-inline constexpr api::SizedInternalFormat RgSizedInternalFormat<int16_t> = api::SizedInternalFormat::Rg16i;
+inline constexpr auto RgSizedInternalFormat<int16_t> = api::SizedInternalFormat::Rg16i;
 template<>
-inline constexpr api::SizedInternalFormat RSizedInternalFormat<int16_t> = api::SizedInternalFormat::R16i;
+inline constexpr auto RSizedInternalFormat<int16_t> = api::SizedInternalFormat::R16i;
 
 template<>
-inline constexpr api::SizedInternalFormat RgbaSizedInternalFormat<int32_t> = api::SizedInternalFormat::Rgba32i;
+inline constexpr auto RgbaSizedInternalFormat<int32_t> = api::SizedInternalFormat::Rgba32i;
 template<>
-inline constexpr api::SizedInternalFormat RgbSizedInternalFormat<int32_t> = api::SizedInternalFormat::Rgb32i;
+inline constexpr auto RgbSizedInternalFormat<int32_t> = api::SizedInternalFormat::Rgb32i;
 template<>
-inline constexpr api::SizedInternalFormat RgSizedInternalFormat<int32_t> = api::SizedInternalFormat::Rg32i;
+inline constexpr auto RgSizedInternalFormat<int32_t> = api::SizedInternalFormat::Rg32i;
 template<>
-inline constexpr api::SizedInternalFormat RSizedInternalFormat<int32_t> = api::SizedInternalFormat::R32i;
+inline constexpr auto RSizedInternalFormat<int32_t> = api::SizedInternalFormat::R32i;
 
 template<>
-inline constexpr api::SizedInternalFormat RgbaSizedInternalFormat<float> = api::SizedInternalFormat::Rgba32f;
+inline constexpr auto RgbaSizedInternalFormat<float> = api::SizedInternalFormat::Rgba32f;
 template<>
-inline constexpr api::SizedInternalFormat RgbSizedInternalFormat<float> = api::SizedInternalFormat::Rgb32f;
+inline constexpr auto RgbSizedInternalFormat<float> = api::SizedInternalFormat::Rgb32f;
 template<>
-inline constexpr api::SizedInternalFormat RgSizedInternalFormat<float> = api::SizedInternalFormat::Rg32f;
+inline constexpr auto RgSizedInternalFormat<float> = api::SizedInternalFormat::Rg32f;
 template<>
-inline constexpr api::SizedInternalFormat RSizedInternalFormat<float> = api::SizedInternalFormat::R32f;
+inline constexpr auto RSizedInternalFormat<float> = api::SizedInternalFormat::R32f;
 
 template<>
-inline constexpr api::SizedInternalFormat RgbaSizedInternalFormat<api::core::Half> = api::SizedInternalFormat::Rgba16f;
+inline constexpr auto RgbaSizedInternalFormat<api::core::Half> = api::SizedInternalFormat::Rgba16f;
 template<>
-inline constexpr api::SizedInternalFormat RgbSizedInternalFormat<api::core::Half> = api::SizedInternalFormat::Rgb16f;
+inline constexpr auto RgbSizedInternalFormat<api::core::Half> = api::SizedInternalFormat::Rgb16f;
 template<>
-inline constexpr api::SizedInternalFormat RgSizedInternalFormat<api::core::Half> = api::SizedInternalFormat::Rg16f;
+inline constexpr auto RgSizedInternalFormat<api::core::Half> = api::SizedInternalFormat::Rg16f;
 template<>
-inline constexpr api::SizedInternalFormat RSizedInternalFormat<api::core::Half> = api::SizedInternalFormat::R16f;
+inline constexpr auto RSizedInternalFormat<api::core::Half> = api::SizedInternalFormat::R16f;
 
 template<typename>
 inline constexpr auto DepthInternalFormat = detail::InvalidValue{};
 template<>
-inline constexpr api::SizedInternalFormat DepthInternalFormat<int16_t> = api::SizedInternalFormat::DepthComponent16;
+inline constexpr auto DepthInternalFormat<int16_t> = api::SizedInternalFormat::DepthComponent16;
 template<>
-inline constexpr api::SizedInternalFormat DepthInternalFormat<int32_t> = api::SizedInternalFormat::DepthComponent32;
+inline constexpr auto DepthInternalFormat<int32_t> = api::SizedInternalFormat::DepthComponent32;
 template<>
-inline constexpr api::SizedInternalFormat DepthInternalFormat<float> = api::SizedInternalFormat::DepthComponent32f;
+inline constexpr auto DepthInternalFormat<float> = api::SizedInternalFormat::DepthComponent32f;
 } // namespace gl
diff --git a/src/soglb/gl/vertexarray.h b/src/soglb/gl/vertexarray.h
index fc8a2667e..fbd109f72 100644
--- a/src/soglb/gl/vertexarray.h
+++ b/src/soglb/gl/vertexarray.h
@@ -5,7 +5,7 @@
 
 #include <cstddef>
 #include <gl/glassert.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <string_view>
 #include <tuple>
@@ -17,7 +17,6 @@ namespace gl
 template<typename IndexT, typename VertexT0, typename... VertexTs>
 class VertexArray final : public BindableResource<api::ObjectIdentifier::VertexArray>
 {
-private:
   template<typename... Ts, size_t... Is>
   void bindVertexAttributes(const std::tuple<Ts...>& t, const Program& p, const std::index_sequence<Is...>&)
   {
@@ -102,4 +101,4 @@ class VertexArray final : public BindableResource<api::ObjectIdentifier::VertexA
   IndexBufferPtr m_indexBuffer;
   VertexBuffers m_vertexBuffers;
 };
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/vertexbuffer.h b/src/soglb/gl/vertexbuffer.h
index db677d4f5..aa8e04f70 100644
--- a/src/soglb/gl/vertexbuffer.h
+++ b/src/soglb/gl/vertexbuffer.h
@@ -6,7 +6,7 @@
 
 #include <cstdint>
 #include <gl/glassert.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <map>
 #include <string>
 #include <string_view>
@@ -27,7 +27,7 @@ class VertexAttribute final
   template<typename U>
   // cppcheck-suppress noExplicitConstructor
   // NOLINTNEXTLINE(google-explicit-constructor)
-  VertexAttribute(const U T::*member, const bool normalized = false)
+  VertexAttribute(const U T::* member, const bool normalized = false)
       : m_type{VertexAttribType<U>}
       , m_relativeOffset{static_cast<uint32_t>(
           reinterpret_cast<uintptr_t>( // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
@@ -66,8 +66,8 @@ class VertexBuffer final : public ArrayBuffer<T>
   explicit VertexBuffer(VertexLayout<T> layout,
                         const std::string_view& label,
                         api::BufferUsage usage,
-                        const gsl::span<const T>& data,
-                        uint32_t divisor = 0)
+                        const gsl_lite::span<const T>& data,
+                        const uint32_t divisor = 0)
       : ArrayBuffer<T>{label, usage, data}
       , m_layout{std::move(layout)}
       , m_divisor{divisor}
@@ -76,7 +76,8 @@ class VertexBuffer final : public ArrayBuffer<T>
   }
 
   explicit VertexBuffer(
-    VertexLayout<T> layout, const std::string_view& label, api::BufferUsage usage, const T& data, uint32_t divisor = 0)
+    VertexLayout<T> layout, const std::string_view& label, api::BufferUsage usage, const T& data,
+                        const uint32_t divisor = 0)
       : ArrayBuffer<T>{label, usage, data}
       , m_layout{std::move(layout)}
       , m_divisor{divisor}
@@ -126,4 +127,4 @@ void VertexAttribute<T>::bindVertexAttribute(const api::core::Handle vertexArray
     GL_ASSERT(api::vertexArrayAttribBinding(vertexArray, *input.getLocation() + locationOffset, bindingIndex));
   }
 }
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/window.cpp b/src/soglb/gl/window.cpp
index 98a5eddd6..aab529bb7 100644
--- a/src/soglb/gl/window.cpp
+++ b/src/soglb/gl/window.cpp
@@ -10,7 +10,7 @@
 #include <boost/throw_exception.hpp>
 #include <filesystem>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iterator>
 #include <mutex>
 #include <stdexcept>
@@ -22,18 +22,19 @@ namespace gl
 namespace
 {
 std::mutex focusStatesMutex;
+
 auto& getFocusStates()
 {
   static std::unordered_map<GLFWwindow*, bool> focusStates;
   return focusStates;
 }
 
-void glErrorCallback(const int err, const gsl::czstring msg)
+void glErrorCallback(const int err, const gsl_lite::czstring msg)
 {
   BOOST_LOG_TRIVIAL(error) << "glfw Error " << err << ": " << msg;
 }
 
-void windowFocusCallback(GLFWwindow* window, int focused)
+void windowFocusCallback(GLFWwindow* window, const int focused)
 {
   const std::lock_guard guard{focusStatesMutex};
   getFocusStates()[window] = focused == GLFW_TRUE;
@@ -59,7 +60,7 @@ void terminateGlfw()
 
 Window::Window(const std::vector<std::filesystem::path>& logoPaths,
                const glm::ivec2& windowSize,
-               bool borderlessFullscreen)
+               const bool borderlessFullscreen)
     : m_windowPos{0, 0}
     , m_windowSize{windowSize}
 {
@@ -102,29 +103,27 @@ Window::Window(const std::vector<std::filesystem::path>& logoPaths,
 
   {
     std::vector<CImgWrapper> imgWrappers;
-    std::transform(logoPaths.begin(),
-                   logoPaths.end(),
-                   std::back_inserter(imgWrappers),
-                   [](const std::filesystem::path& p)
-                   {
-                     auto tmp = CImgWrapper{p};
-                     tmp.interleave();
-                     return tmp;
-                   });
+    std::ranges::transform(logoPaths,
+                           std::back_inserter(imgWrappers),
+                           [](const std::filesystem::path& p)
+                           {
+                             auto tmp = CImgWrapper{p};
+                             tmp.interleave();
+                             return tmp;
+                           });
     std::vector<GLFWimage> glfwImages;
-    std::transform(imgWrappers.begin(),
-                   imgWrappers.end(),
-                   std::back_inserter(glfwImages),
-                   [](const CImgWrapper& srcImg)
-                   {
-                     GLFWimage img;
-                     img.width = srcImg.width();
-                     img.height = srcImg.height();
-                     img.pixels
-                       = const_cast<unsigned char*>(srcImg.data()); // NOLINT(cppcoreguidelines-pro-type-const-cast)
-                     return img;
-                   });
-    glfwSetWindowIcon(m_window, gsl::narrow<int>(glfwImages.size()), glfwImages.data());
+    std::ranges::transform(imgWrappers,
+                           std::back_inserter(glfwImages),
+                           [](const CImgWrapper& srcImg)
+                           {
+                             GLFWimage img;
+                             img.width = srcImg.width();
+                             img.height = srcImg.height();
+                             img.pixels = const_cast<unsigned char*>(
+                               srcImg.data()); // NOLINT(cppcoreguidelines-pro-type-const-cast)
+                             return img;
+                           });
+    glfwSetWindowIcon(m_window, gsl_lite::narrow<int>(glfwImages.size()), glfwImages.data());
   }
 
   glfwMakeContextCurrent(m_window);
@@ -231,7 +230,7 @@ Window::~Window()
 bool Window::hasFocus() const
 {
   const std::lock_guard guard{focusStatesMutex};
-  auto it = getFocusStates().find(m_window);
+  const auto it = getFocusStates().find(m_window);
   return it != getFocusStates().end() && it->second;
 }
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/soglb/gl/window.h b/src/soglb/gl/window.h
index 99282134c..857ce32ae 100644
--- a/src/soglb/gl/window.h
+++ b/src/soglb/gl/window.h
@@ -4,7 +4,7 @@
 
 #include <filesystem>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <vector>
 
 namespace gl
@@ -28,9 +28,9 @@ class Window final
 
   void swapBuffers() const;
 
-  [[nodiscard]] gsl::not_null<GLFWwindow*> getWindow() const
+  [[nodiscard]] gsl_lite::not_null<GLFWwindow*> getWindow() const
   {
-    return gsl::not_null{m_window};
+    return gsl_lite::not_null{m_window};
   }
 
   [[nodiscard]] const glm::ivec2& getViewport() const
@@ -41,7 +41,7 @@ class Window final
   void setFullscreen();
   void setWindowed();
 
-  void setFullscreen(bool value)
+  void setFullscreen(const bool value)
   {
     if(value)
       setFullscreen();
@@ -63,4 +63,4 @@ class Window final
   glm::ivec2 m_viewport{0};
   bool m_isFullscreen = false;
 };
-} // namespace gl
+} // namespace gl
\ No newline at end of file
diff --git a/src/testutil/teamcityformatter.cpp b/src/testutil/teamcityformatter.cpp
index 97456644e..edd1d89b3 100644
--- a/src/testutil/teamcityformatter.cpp
+++ b/src/testutil/teamcityformatter.cpp
@@ -33,9 +33,9 @@ namespace jetbrains::teamcity
 {
 namespace
 {
-const char* ASSERT_CTX = "Assertion has occurred in a following context:";
-const char* FAILURE_CTX = "Failure has occurred in a following context:";
-const boost::unit_test::test_unit_type UNIT_TEST_CASE = boost::unit_test::TUT_CASE;
+const auto ASSERT_CTX = "Assertion has occurred in a following context:";
+const auto FAILURE_CTX = "Failure has occurred in a following context:";
+constexpr boost::unit_test::test_unit_type UNIT_TEST_CASE = boost::unit_test::TUT_CASE;
 
 // Formatter implementation
 std::string toString(const boost::unit_test::const_string& bStr)
@@ -74,18 +74,15 @@ std::string toString(const boost::execution_exception& excpt)
   std::stringstream ss(std::ios_base::out);
   ss << excpt.where().m_file_name;
 
-  const size_t line = excpt.where().m_line_num;
-  if(line != 0)
+  if(const size_t line = excpt.where().m_line_num; line != 0)
     ss << ':' << line;
 
-  const boost::unit_test::const_string& fn = excpt.where().m_function;
-  if(!fn.empty())
+  if(const boost::unit_test::const_string& fn = excpt.where().m_function; !fn.empty())
     ss << '[' << fn << ']';
 
   ss << ": " << excpt.what();
 
-  const std::string& code = toString(excpt.code());
-  if(!code.empty())
+  if(const std::string& code = toString(excpt.code()); !code.empty())
     ss << " (" << code << ')';
 
   return ss.str();
@@ -93,7 +90,7 @@ std::string toString(const boost::execution_exception& excpt)
 } // anonymous namespace
 
 /// Custom formatter for TeamCity messages
-class TeamcityBoostLogFormatter : public boost::unit_test::unit_test_log_formatter
+class TeamcityBoostLogFormatter final : public boost::unit_test::unit_test_log_formatter
 {
   TeamcityMessages m_messages{};
   std::string m_currentDetails{};
@@ -101,8 +98,8 @@ class TeamcityBoostLogFormatter : public boost::unit_test::unit_test_log_formatt
   std::string m_currentContextDetails{};
 
 public:
-  using boost::unit_test::unit_test_log_formatter::log_entry_value;
-  using boost::unit_test::unit_test_log_formatter::test_unit_skipped;
+  using unit_test_log_formatter::log_entry_value;
+  using unit_test_log_formatter::test_unit_skipped;
 
   explicit TeamcityBoostLogFormatter(std::string flowId);
   TeamcityBoostLogFormatter();
@@ -131,6 +128,7 @@ class TeamcityBoostLogFormatter : public boost::unit_test::unit_test_log_formatt
   void entry_context_start(std::ostream&, boost::unit_test::log_level) override;
   void log_entry_context(std::ostream&, boost::unit_test::log_level, boost::unit_test::const_string) override;
   void entry_context_finish(std::ostream&, boost::unit_test::log_level) override;
+
   [[nodiscard]] std::string get_default_stream_description() const override
   {
     return "TeamCity (via service messages)";
@@ -157,8 +155,8 @@ TeamcityBoostLogFormatter::TeamcityBoostLogFormatter()
 {
 }
 
-TeamcityBoostLogFormatter::TeamcityBoostLogFormatter(std::string id)
-    : m_flowId(std::move(id))
+TeamcityBoostLogFormatter::TeamcityBoostLogFormatter(std::string flowId)
+    : m_flowId(std::move(flowId))
 {
 }
 
@@ -238,7 +236,7 @@ void TeamcityBoostLogFormatter::log_entry_start(std::ostream& /*out*/
 
 void TeamcityBoostLogFormatter::log_entry_value(std::ostream& /*out*/
                                                 ,
-                                                boost::unit_test::const_string value)
+                                                const boost::unit_test::const_string value)
 {
   m_currentDetails += toString(value);
 }
@@ -272,23 +270,23 @@ void TeamcityBoostLogFormatter::log_exception_finish(std::ostream& /*out*/)
 void TeamcityBoostLogFormatter::test_unit_skipped(std::ostream& /*out*/
                                                   ,
                                                   const boost::unit_test::test_unit& tu,
-                                                  boost::unit_test::const_string reason)
+                                                  const boost::unit_test::const_string reason)
 {
   m_messages.testIgnored(tu.p_name, toString(reason), m_flowId);
 }
 
 void TeamcityBoostLogFormatter::entry_context_start(std::ostream& /*out*/
                                                     ,
-                                                    boost::unit_test::log_level l)
+                                                    const boost::unit_test::log_level l)
 {
-  const char* initial_msg = (l == boost::unit_test::log_successful_tests ? ASSERT_CTX : FAILURE_CTX);
+  const char* initial_msg = l == boost::unit_test::log_successful_tests ? ASSERT_CTX : FAILURE_CTX;
   m_currentContextDetails = initial_msg;
 }
 
 void TeamcityBoostLogFormatter::log_entry_context(std::ostream& /*out*/
                                                   ,
                                                   boost::unit_test::log_level,
-                                                  boost::unit_test::const_string ctx)
+                                                  const boost::unit_test::const_string ctx)
 {
   m_currentContextDetails += '\n' + toString(ctx);
 }
@@ -296,5 +294,4 @@ void TeamcityBoostLogFormatter::log_entry_context(std::ostream& /*out*/
 void TeamcityBoostLogFormatter::entry_context_finish(std::ostream& /*out*/, boost::unit_test::log_level)
 {
 }
-
 } // namespace jetbrains::teamcity
diff --git a/src/testutil/teamcitymessages.cpp b/src/testutil/teamcitymessages.cpp
index dc256f3f0..cd96679e0 100644
--- a/src/testutil/teamcitymessages.cpp
+++ b/src/testutil/teamcitymessages.cpp
@@ -119,21 +119,23 @@ void TeamcityMessages::setOutput(std::ostream& out)
   m_out = &out;
 }
 
-void TeamcityMessages::suiteStarted(const std::string& name, const std::string& flowId)
+void TeamcityMessages::suiteStarted(const std::string& name, const std::string& flowId) const
 {
   RaiiMessage msg("testSuiteStarted", *m_out);
   msg.writeProperty("name", name);
   msg.writePropertyIfNonEmpty("flowId", flowId);
 }
 
-void TeamcityMessages::suiteFinished(const std::string& name, const std::string& flowId)
+void TeamcityMessages::suiteFinished(const std::string& name, const std::string& flowId) const
 {
   RaiiMessage msg("testSuiteFinished", *m_out);
   msg.writeProperty("name", name);
   msg.writePropertyIfNonEmpty("flowId", flowId);
 }
 
-void TeamcityMessages::testStarted(const std::string& name, const std::string& flowId, const bool captureStandardOutput)
+void TeamcityMessages::testStarted(const std::string& name,
+                                   const std::string& flowId,
+                                   const bool captureStandardOutput) const
 {
   RaiiMessage msg("testStarted", *m_out);
   msg.writeProperty("name", name);
@@ -143,7 +145,7 @@ void TeamcityMessages::testStarted(const std::string& name, const std::string& f
     msg.writeProperty("captureStandardOutput", "true"); // false by default
 }
 
-void TeamcityMessages::testFinished(const std::string& name, const std::string& flowId)
+void TeamcityMessages::testFinished(const std::string& name, const std::string& flowId) const
 {
   RaiiMessage msg("testFinished", *m_out);
 
@@ -151,7 +153,9 @@ void TeamcityMessages::testFinished(const std::string& name, const std::string&
   msg.writePropertyIfNonEmpty("flowId", flowId);
 }
 
-void TeamcityMessages::testFinished(const std::string& name, const unsigned long durationMs, const std::string& flowId)
+void TeamcityMessages::testFinished(const std::string& name,
+                                    const unsigned long durationMs,
+                                    const std::string& flowId) const
 {
   RaiiMessage msg("testFinished", *m_out);
 
@@ -168,7 +172,7 @@ void TeamcityMessages::testFinished(const std::string& name, const unsigned long
 void TeamcityMessages::testFailed(const std::string& name,
                                   const std::string& message,
                                   const std::string& details,
-                                  const std::string& flowId)
+                                  const std::string& flowId) const
 {
   RaiiMessage msg("testFailed", *m_out);
   msg.writeProperty("name", name);
@@ -177,7 +181,7 @@ void TeamcityMessages::testFailed(const std::string& name,
   msg.writePropertyIfNonEmpty("flowId", flowId);
 }
 
-void TeamcityMessages::testIgnored(const std::string& name, const std::string& message, const std::string& flowId)
+void TeamcityMessages::testIgnored(const std::string& name, const std::string& message, const std::string& flowId) const
 {
   RaiiMessage msg("testIgnored", *m_out);
   msg.writeProperty("name", name);
@@ -188,7 +192,7 @@ void TeamcityMessages::testIgnored(const std::string& name, const std::string& m
 void TeamcityMessages::testOutput(const std::string& name,
                                   const std::string& output,
                                   const std::string& flowId,
-                                  const bool isStdError)
+                                  const bool isStdError) const
 {
   RaiiMessage msg(isStdError ? "testStdErr" : "testStdOut", *m_out);
   msg.writeProperty("name", name);
diff --git a/src/testutil/teamcitymessages.h b/src/testutil/teamcitymessages.h
index 52d538b8d..9e9dec0bd 100644
--- a/src/testutil/teamcitymessages.h
+++ b/src/testutil/teamcitymessages.h
@@ -34,28 +34,29 @@ class TeamcityMessages
   std::ostream* m_out;
 
 public:
-  static const bool StdErr = true;
-  static const bool StdOut = false;
+  static constexpr bool StdErr = true;
+  static constexpr bool StdOut = false;
 
   TeamcityMessages();
 
   void setOutput(std::ostream&);
 
-  void suiteStarted(const std::string& name, const std::string& flowid = {});
-  void suiteFinished(const std::string& name, const std::string& flowid = {});
+  void suiteStarted(const std::string& name, const std::string& flowId = {}) const;
+  void suiteFinished(const std::string& name, const std::string& flowId = {}) const;
 
-  void testStarted(const std::string& name, const std::string& flowid = {}, bool captureStandardOutput = false);
-  void testFinished(const std::string& name, const std::string& flowid = {});
-  void testFinished(const std::string& name, unsigned long durationMs, const std::string& flowid = {});
+  void testStarted(const std::string& name, const std::string& flowId = {}, bool captureStandardOutput = false) const;
+  void testFinished(const std::string& name, const std::string& flowId = {}) const;
+  void testFinished(const std::string& name, unsigned long durationMs, const std::string& flowId = {}) const;
 
   void testFailed(const std::string& name,
                   const std::string& message,
                   const std::string& details,
-                  const std::string& flowid = {});
-  void testIgnored(const std::string& name, const std::string& message, const std::string& flowid = {});
+                  const std::string& flowId = {}) const;
+  void testIgnored(const std::string& name, const std::string& message, const std::string& flowId = {}) const;
 
-  void
-    testOutput(const std::string& name, const std::string& output, const std::string& flowid, bool isStdErr = StdOut);
+  void testOutput(const std::string& name,
+                  const std::string& output,
+                  const std::string& flowId,
+                  bool isStdError = StdOut) const;
 };
-
 } // namespace jetbrains::teamcity
diff --git a/src/ui/boxgouraud.h b/src/ui/boxgouraud.h
index c020ce46c..e5bc07788 100644
--- a/src/ui/boxgouraud.h
+++ b/src/ui/boxgouraud.h
@@ -55,9 +55,9 @@ struct BackgroundGouraud
   }
 };
 
-constexpr gl::SRGBA8 UiBackdropCenterColor{0, 128, 0, DefaultBackgroundAlpha};
-constexpr gl::SRGBA8 UiBackdropOuterColor{0, 0, 0, DefaultBackgroundAlpha};
-constexpr BackgroundGouraud UiBackdrop{
+inline const gl::SRGBA8 UiBackdropCenterColor{0, 128, 0, DefaultBackgroundAlpha};
+inline const gl::SRGBA8 UiBackdropOuterColor{0, 0, 0, DefaultBackgroundAlpha};
+inline const BackgroundGouraud UiBackdrop{
   BoxGouraud{UiBackdropOuterColor, UiBackdropOuterColor, UiBackdropCenterColor, UiBackdropOuterColor},
   BoxGouraud{UiBackdropOuterColor, UiBackdropOuterColor, UiBackdropOuterColor, UiBackdropCenterColor},
   BoxGouraud{UiBackdropCenterColor, UiBackdropOuterColor, UiBackdropOuterColor, UiBackdropOuterColor},
diff --git a/src/ui/detailedlevelstats.cpp b/src/ui/detailedlevelstats.cpp
index e12749f6e..c02e0f231 100644
--- a/src/ui/detailedlevelstats.cpp
+++ b/src/ui/detailedlevelstats.cpp
@@ -75,7 +75,7 @@ DetailedLevelStats::DetailedLevelStats(const engine::world::World& world)
 
   const auto& inv = player.getInventory();
 
-  auto addAmmoStats = [this, &inv](const char* weaponName, engine::WeaponType weaponType, size_t& y0)
+  auto addAmmoStats = [this, &inv](const char* weaponName, const engine::WeaponType weaponType, size_t& y0)
   {
     const auto& ammo = inv.getAmmo(weaponType);
     if(inv.count(ammo.weaponType) == 0 && ammo.shots == 0 && ammo.hits == 0 && ammo.hitsTotal == 0 && ammo.misses == 0
@@ -122,11 +122,11 @@ DetailedLevelStats::DetailedLevelStats(const engine::world::World& world)
 
 DetailedLevelStats::~DetailedLevelStats() = default;
 
-void DetailedLevelStats::draw(Ui& ui, const engine::Presenter& presenter, bool compass) const
+void DetailedLevelStats::draw(Ui& ui, const engine::Presenter& presenter, const bool compass) const
 {
   m_grid->fitToContent();
   m_container->fitToContent();
-  m_grid->update(false);
+  m_grid->tick(false);
 
   if(compass)
   {
diff --git a/src/ui/levelstats.h b/src/ui/levelstats.h
index 53f3f266b..c69585877 100644
--- a/src/ui/levelstats.h
+++ b/src/ui/levelstats.h
@@ -19,7 +19,7 @@ class LevelStats
 {
 public:
   LevelStats(std::string title,
-             size_t totalSecrets,
+             const size_t totalSecrets,
              std::shared_ptr<engine::Player> player,
              std::shared_ptr<engine::Presenter> presenter)
       : m_title{std::move(title)}
diff --git a/src/ui/pickupwidget.h b/src/ui/pickupwidget.h
index 05d8be7d5..30352b063 100644
--- a/src/ui/pickupwidget.h
+++ b/src/ui/pickupwidget.h
@@ -14,7 +14,7 @@ namespace ui
 class PickupWidget
 {
 public:
-  explicit PickupWidget(const core::Frame& duration, engine::world::Sprite sprite, size_t count)
+  explicit PickupWidget(const core::Tick& duration, engine::world::Sprite sprite, size_t count)
       : m_duration{duration}
       , m_sprite{std::move(sprite)}
       , m_count{count}
@@ -23,10 +23,10 @@ class PickupWidget
 
   bool expired() const
   {
-    return m_duration <= 0_frame;
+    return m_duration <= 0_tick;
   }
 
-  void draw(ui::Ui& ui, int x, int y, const TRFont& font, float scale) const
+  void draw(Ui& ui, int x, int y, const TRFont& font, const float scale) const
   {
     ui.draw(m_sprite, {x, y}, scale);
     if(m_count <= 1)
@@ -37,9 +37,9 @@ class PickupWidget
     txt.draw(ui, font, {x, y});
   }
 
-  void nextFrame()
+  void tick()
   {
-    m_duration -= 1_frame;
+    m_duration -= 1_tick;
   }
 
   [[nodiscard]] auto getWidth() const
@@ -57,13 +57,13 @@ class PickupWidget
     return m_sprite;
   }
 
-  void setCount(size_t val)
+  void setCount(const size_t val)
   {
     m_count = val;
   }
 
 private:
-  core::Frame m_duration;
+  core::Tick m_duration;
   mutable engine::world::Sprite m_sprite;
   size_t m_count;
 };
diff --git a/src/ui/text.cpp b/src/ui/text.cpp
index b261f46bd..02332a0c7 100644
--- a/src/ui/text.cpp
+++ b/src/ui/text.cpp
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <gl/pixel.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 #include <tuple>
 #include <utility>
@@ -23,14 +23,14 @@ namespace
 constexpr int LetterSpacing = 1;
 constexpr int WordSpacing = 6;
 
-const std::array<const int, 110> charWidths{
+constexpr std::array<const int, 110> charWidths{
   14, 11, 11, 11, 11, 11, 11, 13, 8,  11, 12, 11, 13, 13, 12, 11, 12, 12, 11, 12, 13, 13, 13, 12, 12,
   11, 9,  9,  9,  9,  9,  9,  9,  9,  5,  9,  9,  5,  12, 10, 9,  9,  9,  8,  9,  8,  9,  9,  11, 9,
   9,  9,  12, 8,  10, 10, 10, 10, 10, 9,  10, 10, 5,  5,  5,  11, 9,  10, 8,  6,  6,  7,  7,  3,  /* szlig */ 7,
   8,  13, 16, 9,  4,  12, 12, 7,  5,  7,  7,  7,  7,  7,  7,  7,  7,  16, 14, 14, 14, 16, 16, 16, 16,
   16, 12, 14, 8,  8,  8,  8,  8,  8,  8};
 
-const std::array<const uint8_t, 98> charToSprite{
+constexpr std::array<const uint8_t, 98> charToSprite{
   0,  64, 66, 78, 77, 74, 78, 79, 69, 70, 92, 72, 63, 71, 62, 68, 52,  53,  54,  55, 56, 57, 58, 59, 60,
   61, 73, 73, 66, 74, 75, 65, 0,  0,  1,  2,  3,  4,  5,  6,  7,  8,   9,   10,  11, 12, 13, 14, 15, 16,
   17, 18, 19, 20, 21, 22, 23, 24, 25, 80, 76, 81, 97, 98, 77, 26, 27,  28,  29,  30, 31, 32, 33, 34, 35,
@@ -114,17 +114,17 @@ std::string makeAmmoString(const std::string& str)
 
     if(c < 'A')
     {
-      result += static_cast<char>(int(c) - int('0') + 1);
+      result += static_cast<char>(static_cast<int>(c) - static_cast<int>('0') + 1);
     }
     else
     {
-      result += static_cast<char>(int(c) - int('A') + 12);
+      result += static_cast<char>(static_cast<int>(c) - static_cast<int>('A') + 12);
     }
   }
   return result;
 }
 
-void TRFont::draw(ui::Ui& ui, size_t sprite, const glm::ivec2& xy, float scale, float alpha) const
+void TRFont::draw(Ui& ui, const size_t sprite, const glm::ivec2& xy, const float scale, const float alpha) const
 {
   ui.draw(m_sprites[sprite], xy, scale, alpha);
 }
@@ -135,7 +135,7 @@ Text::Text(const std::string& text)
   gsl_Ensures(m_width >= 0);
 }
 
-void Text::draw(Ui& ui, const TRFont& font, const glm::ivec2& position, float scale, float alpha) const
+void Text::draw(Ui& ui, const TRFont& font, const glm::ivec2& position, const float scale, const float alpha) const
 {
   for(const auto& [xy, sprite] : m_layout)
   {
@@ -143,14 +143,15 @@ void Text::draw(Ui& ui, const TRFont& font, const glm::ivec2& position, float sc
   }
 }
 
-void drawBox(const Text& text, Ui& ui, const glm::ivec2& pos, int padding, const gl::SRGBA8& color, float scale)
+void drawBox(
+  const Text& text, Ui& ui, const glm::ivec2& pos, const int padding, const gl::SRGBA8& color, const float scale)
 {
   ui.drawBox(pos + glm::ivec2{-padding, padding},
              glm::ivec2{text.getWidth() * scale + 2 * padding, -FontHeight * scale - 2 * padding - 2},
              color);
 }
 
-std::vector<std::string> breakLines(const std::string& text, int maxWidth)
+std::vector<std::string> breakLines(const std::string& text, const int maxWidth)
 {
   std::vector<std::string> words;
   size_t start = 0;
@@ -218,4 +219,4 @@ std::vector<std::string> breakLines(const std::string& text, int maxWidth)
 
   return lines;
 }
-} // namespace ui
+} // namespace ui
\ No newline at end of file
diff --git a/src/ui/text.h b/src/ui/text.h
index 76be5cb9c..e92160d44 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -6,7 +6,7 @@
 #include <cstdint>
 #include <gl/pixel.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 #include <tuple>
 #include <vector>
@@ -19,7 +19,7 @@ extern std::string makeAmmoString(const std::string& str);
 
 class TRFont final
 {
-  gsl::span<const engine::world::Sprite> m_sprites;
+  gsl_lite::span<const engine::world::Sprite> m_sprites;
 
 public:
   explicit TRFont(const engine::world::SpriteSequence& sequence)
@@ -27,7 +27,7 @@ class TRFont final
   {
   }
 
-  void draw(ui::Ui& ui, size_t sprite, const glm::ivec2& xy, float scale, float alpha) const;
+  void draw(Ui& ui, size_t sprite, const glm::ivec2& xy, float scale, float alpha) const;
 };
 
 class Text
@@ -50,4 +50,4 @@ class Text
 extern void
   drawBox(const Text& text, Ui& ui, const glm::ivec2& pos, int padding, const gl::SRGBA8& color, float scale = 1);
 [[nodiscard]] extern std::vector<std::string> breakLines(const std::string& text, int maxWidth);
-} // namespace ui
+} // namespace ui
\ No newline at end of file
diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index 0969d1188..eaa30c7d5 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -26,7 +26,7 @@
 #include <glm/common.hpp>
 #include <glm/mat4x4.hpp>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <iterator>
 #include <memory>
@@ -96,19 +96,19 @@ void createQuad(std::vector<Ui::UiVertex>& vertices, const glm::vec2& a, const g
   vertices.emplace_back(Ui::UiVertex{{b.x, a.y}, {1, 0, -1}, glColor, glColor, glColor, glColor});
 }
 
-void createHLine(std::vector<Ui::UiVertex>& vertices, const glm::vec2& a, int length, const gl::SRGBA8& color)
+void createHLine(std::vector<Ui::UiVertex>& vertices, const glm::vec2& a, const int length, const gl::SRGBA8& color)
 {
   createQuad(vertices, a, glm::vec2{length, 1}, color);
 }
 
-void createVLine(std::vector<Ui::UiVertex>& vertices, const glm::vec2& a, int length, const gl::SRGBA8& color)
+void createVLine(std::vector<Ui::UiVertex>& vertices, const glm::vec2& a, const int length, const gl::SRGBA8& color)
 {
   createQuad(vertices, a, glm::vec2{1, length}, color);
 }
 } // namespace
 
-gslu::nn_shared<gl::VertexBuffer<Ui::UiVertex>> Ui::UiVertex::createVertexBuffer(gl::api::BufferUsage usage,
-                                                                                 const gsl::span<Ui::UiVertex>& data)
+gslu::nn_shared<gl::VertexBuffer<Ui::UiVertex>>
+  Ui::UiVertex::createVertexBuffer(gl::api::BufferUsage usage, const gsl_lite::span<UiVertex>& data)
 {
   static const gl::VertexLayout<UiVertex> layout{
     {VERTEX_ATTRIBUTE_POSITION_NAME, &UiVertex::pos},
@@ -119,13 +119,13 @@ gslu::nn_shared<gl::VertexBuffer<Ui::UiVertex>> Ui::UiVertex::createVertexBuffer
     {VERTEX_ATTRIBUTE_COLOR_BOTTOM_RIGHT_NAME, &UiVertex::bottomRight},
     {VERTEX_ATTRIBUTE_COLOR_NAME, &UiVertex::color},
   };
-  return gsl::make_shared<gl::VertexBuffer<UiVertex>>(layout, "ui" + gl::VboSuffix, usage, data);
+  return gsl_lite::make_shared<gl::VertexBuffer<UiVertex>>(layout, "ui" + gl::VboSuffix, usage, data);
 }
 
 gslu::nn_shared<gl::ElementArrayBuffer<uint16_t>> Ui::UiVertex::createIndexBuffer(gl::api::BufferUsage usage,
-                                                                                  const gsl::span<uint16_t>& data)
+                                                                                  const gsl_lite::span<uint16_t>& data)
 {
-  return gsl::make_shared<gl::ElementArrayBuffer<uint16_t>>("ui" + gl::IndexBufferSuffix, usage, data);
+  return gsl_lite::make_shared<gl::ElementArrayBuffer<uint16_t>>("ui" + gl::IndexBufferSuffix, usage, data);
 }
 
 Ui::Ui(std::shared_ptr<render::material::Material> material,
@@ -137,17 +137,17 @@ Ui::Ui(std::shared_ptr<render::material::Material> material,
 {
 }
 
-void Ui::drawHLine(const glm::ivec2& xy, int length, const gl::SRGBA8& color)
+void Ui::drawHLine(const glm::ivec2& xy, const int length, const gl::SRGBA8& color)
 {
   createHLine(m_vertices, xy, length + glm::sign(length), color);
 }
 
-void Ui::drawVLine(const glm::ivec2& xy, int length, const gl::SRGBA8& color)
+void Ui::drawVLine(const glm::ivec2& xy, const int length, const gl::SRGBA8& color)
 {
   createVLine(m_vertices, xy, length + glm::sign(length), color);
 }
 
-void Ui::drawOutlineBox(const glm::ivec2& xy, const glm::ivec2& size, uint8_t alpha)
+void Ui::drawOutlineBox(const glm::ivec2& xy, const glm::ivec2& size, const uint8_t alpha)
 {
   auto color1 = m_palette[15];
   color1.channels[3] = alpha;
@@ -186,25 +186,24 @@ void Ui::render()
   gsl_Expects(m_vertices.size() % 4 == 0);
 
   std::vector<uint16_t> indices;
-  static const std::array<uint16_t, 6> localIndices{0, 1, 2, 0, 2, 3};
+  static constexpr std::array<uint16_t, 6> localIndices{0, 1, 2, 0, 2, 3};
   indices.reserve(m_vertices.size() / 4 * localIndices.size());
   for(size_t i = 0; i < m_vertices.size(); i += 4)
   {
-    std::transform(localIndices.begin(),
-                   localIndices.end(),
-                   std::back_inserter(indices),
-                   [&i](auto localIndex)
-                   {
-                     return gsl::narrow_cast<uint16_t>(i + localIndex);
-                   });
+    std::ranges::transform(localIndices,
+                           std::back_inserter(indices),
+                           [&i](auto localIndex)
+                           {
+                             return gsl_lite::narrow_cast<uint16_t>(i + localIndex);
+                           });
   }
 
   const auto indexBuffer = UiVertex::createIndexBuffer(gl::api::BufferUsage::StaticDraw, indices);
   const auto vbo = UiVertex::createVertexBuffer(gl::api::BufferUsage::StaticDraw, m_vertices);
 
-  const auto vaoNonOpaque = gsl::make_shared<gl::VertexArray<uint16_t, UiVertex>>(
+  const auto vaoNonOpaque = gsl_lite::make_shared<gl::VertexArray<uint16_t, UiVertex>>(
     indexBuffer, std::tuple{vbo}, std::vector{&m_material->getShaderProgram()->getHandle()}, "ui" + gl::VaoSuffix);
-  auto mesh = std::make_shared<render::scene::MeshImpl<uint16_t, UiVertex>>(
+  const auto mesh = std::make_shared<render::scene::MeshImpl<uint16_t, UiVertex>>(
     nullptr, vaoNonOpaque, gl::api::PrimitiveType::Triangles);
   mesh->getMaterialGroup().set(render::material::RenderMode::FullNonOpaque, m_material);
   auto& meshRenderState = mesh->getRenderState();
@@ -226,7 +225,7 @@ void Ui::render()
   reset();
 }
 
-void Ui::draw(const engine::world::Sprite& sprite, const glm::ivec2& xy, float scale, float alpha)
+void Ui::draw(const engine::world::Sprite& sprite, const glm::ivec2& xy, const float scale, const float alpha)
 {
   const auto a = glm::ivec2{glm::vec2{sprite.render0} * scale} + xy;
   const auto b = glm::ivec2{glm::vec2{sprite.render1} * scale} + xy;
@@ -261,4 +260,4 @@ void Ui::draw(const engine::world::Sprite& sprite, const glm::ivec2& xy, float s
                                    glm::vec4{0},
                                    gl::premultiply(glm::vec4{1, 1, 1, alpha})});
 }
-} // namespace ui
+} // namespace ui
\ No newline at end of file
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 246d8cb29..7f7cb6cfa 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -9,7 +9,7 @@
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <vector>
@@ -28,6 +28,9 @@ namespace ui
 {
 struct BoxGouraud;
 
+/**
+ * @brief Collects UI primitives to be rendered later.
+ */
 class Ui final
 {
 public:
@@ -41,10 +44,10 @@ class Ui final
     glm::vec4 bottomRight{0};
     glm::vec4 color{1, 1, 1, 1};
 
-    static gslu::nn_shared<gl::VertexBuffer<Ui::UiVertex>> createVertexBuffer(gl::api::BufferUsage usage,
-                                                                              const gsl::span<Ui::UiVertex>& data);
+    static gslu::nn_shared<gl::VertexBuffer<UiVertex>> createVertexBuffer(gl::api::BufferUsage usage,
+                                                                          const gsl_lite::span<UiVertex>& data);
     static gslu::nn_shared<gl::ElementArrayBuffer<uint16_t>> createIndexBuffer(gl::api::BufferUsage usage,
-                                                                               const gsl::span<uint16_t>& data);
+                                                                               const gsl_lite::span<uint16_t>& data);
   };
 
   explicit Ui(std::shared_ptr<render::material::Material> material,
@@ -54,6 +57,7 @@ class Ui final
   void drawOutlineBox(const glm::ivec2& xy, const glm::ivec2& size, uint8_t alpha = 255);
   void drawBox(const glm::ivec2& xy, const glm::ivec2& size, const BoxGouraud& gouraud);
   void drawBox(const glm::ivec2& xy, const glm::ivec2& size, const gl::SRGBA8& color);
+
   void drawBox(const glm::ivec2& xy, const glm::ivec2& size, const size_t color)
   {
     drawBox(xy, size, m_palette.at(color));
@@ -81,4 +85,4 @@ class Ui final
   glm::ivec2 m_size;
   std::vector<UiVertex> m_vertices;
 };
-} // namespace ui
+} // namespace ui
\ No newline at end of file
diff --git a/src/ui/util.h b/src/ui/util.h
index 9548a964c..44b5a6d14 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -27,7 +27,7 @@ static constexpr char GamepadDPadUpSprite = '\x6b';
 static constexpr char GamepadDPadLeftSprite = '\x6c';
 static constexpr char GamepadDPadRightSprite = '\x6d';
 
-inline std::string getSpriteSelector(char sprite)
+inline std::string getSpriteSelector(const char sprite)
 {
   return std::string{SpriteSelector} + sprite;
 }
diff --git a/src/ui/widgets/checkbox.cpp b/src/ui/widgets/checkbox.cpp
index 84e22ae1c..eb5ad6f73 100644
--- a/src/ui/widgets/checkbox.cpp
+++ b/src/ui/widgets/checkbox.cpp
@@ -6,7 +6,7 @@
 #include "widget.h"
 
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -17,7 +17,7 @@ namespace ui::widgets
 constexpr int ContentOffset = 20;
 
 Checkbox::Checkbox(const std::string& label)
-    : m_content{gsl::make_shared<Label>(label)}
+    : m_content{gsl_lite::make_shared<Label>(label)}
 {
 }
 
@@ -28,28 +28,28 @@ Checkbox::Checkbox(gslu::nn_shared<Widget> content)
 
 Checkbox::~Checkbox() = default;
 
-void Checkbox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
+void Checkbox::draw(Ui& ui, const engine::Presenter& presenter) const
 {
   m_content->setSize({m_size.x - ContentOffset, m_size.y});
   m_content->draw(ui, presenter);
 
-  static constexpr int BoxSize = ui::FontHeight - 2 * ui::OutlineBorderWidth;
+  static constexpr int BoxSize = FontHeight - 2 * OutlineBorderWidth;
   static constexpr int InnerOffset = 3;
   static constexpr int InnerSize = BoxSize - 2 * InnerOffset + 1;
-  ui.drawOutlineBox(m_content->getPosition() + glm::ivec2{ui::OutlineBorderWidth - ContentOffset, 3 - ui::FontHeight},
+  ui.drawOutlineBox(m_content->getPosition() + glm::ivec2{OutlineBorderWidth - ContentOffset, 3 - FontHeight},
                     {BoxSize, BoxSize});
   if(m_checked)
   {
     ui.drawBox(m_content->getPosition()
-                 + glm::ivec2{ui::OutlineBorderWidth + InnerOffset - ContentOffset, 3 + InnerOffset - ui::FontHeight},
+                 + glm::ivec2{OutlineBorderWidth + InnerOffset - ContentOffset, 3 + InnerOffset - FontHeight},
                {InnerSize, InnerSize},
                15);
   }
 }
 
-void Checkbox::update(bool hasFocus)
+void Checkbox::tick(const bool hasFocus)
 {
-  m_content->update(hasFocus);
+  m_content->tick(hasFocus);
 }
 
 void Checkbox::setPosition(const glm::ivec2& position)
@@ -77,4 +77,4 @@ void Checkbox::fitToContent()
   m_content->fitToContent();
   m_size = m_content->getSize() + glm::ivec2{ContentOffset, 0};
 }
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/checkbox.h b/src/ui/widgets/checkbox.h
index cb0aa9538..c79954b61 100644
--- a/src/ui/widgets/checkbox.h
+++ b/src/ui/widgets/checkbox.h
@@ -18,16 +18,16 @@ class Presenter;
 
 namespace ui::widgets
 {
-class Checkbox : public Widget
+class Checkbox final : public Widget
 {
 public:
   explicit Checkbox(const std::string& label);
   explicit Checkbox(gslu::nn_shared<Widget> content);
   ~Checkbox() override;
-  void update(bool hasFocus) override;
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void tick(bool hasFocus) override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
 
-  void setChecked(bool checked) noexcept
+  void setChecked(const bool checked) noexcept
   {
     m_checked = checked;
   }
diff --git a/src/ui/widgets/checklistbox.cpp b/src/ui/widgets/checklistbox.cpp
index ca5b6423e..bbfa31ea6 100644
--- a/src/ui/widgets/checklistbox.cpp
+++ b/src/ui/widgets/checklistbox.cpp
@@ -8,7 +8,7 @@
 #include <cstddef>
 #include <functional>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 #include <utility>
@@ -42,9 +42,9 @@ void CheckListBox::setSize(const glm::ivec2& size)
   m_listBox->setSize(size);
 }
 
-void CheckListBox::update(bool hasFocus)
+void CheckListBox::tick(const bool hasFocus)
 {
-  m_listBox->update(hasFocus);
+  m_listBox->tick(hasFocus);
 }
 
 void CheckListBox::fitToContent()
@@ -64,7 +64,7 @@ gslu::nn_shared<Checkbox> CheckListBox::addSetting(const gslu::nn_shared<Widget>
                                                    std::function<bool()>&& getter,
                                                    std::function<void()>&& toggler)
 {
-  auto checkbox = gsl::make_shared<Checkbox>(content);
+  auto checkbox = gsl_lite::make_shared<Checkbox>(content);
   checkbox->setChecked(getter());
   checkbox->fitToContent();
   m_listBox->append(checkbox);
@@ -75,7 +75,7 @@ gslu::nn_shared<Checkbox> CheckListBox::addSetting(const gslu::nn_shared<Widget>
 gslu::nn_shared<Checkbox>
   CheckListBox::addSetting(const std::string& label, std::function<bool()>&& getter, std::function<void()>&& toggler)
 {
-  return addSetting(gsl::make_shared<Label>(label), std::move(getter), std::move(toggler));
+  return addSetting(gsl_lite::make_shared<Label>(label), std::move(getter), std::move(toggler));
 }
 
 const CheckListBox::CheckBoxData& CheckListBox::getSelected() const
@@ -93,7 +93,7 @@ size_t CheckListBox::getEntryCount() const
   return m_listBox->getWidgets().size();
 }
 
-void CheckListBox::setSelectedEntry(size_t selected)
+void CheckListBox::setSelectedEntry(const size_t selected)
 {
   m_listBox->setSelected(selected);
 }
@@ -107,4 +107,4 @@ bool CheckListBox::prevEntry()
 {
   return m_listBox->prevEntry();
 }
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/checklistbox.h b/src/ui/widgets/checklistbox.h
index 98b38f5ed..17f4b0684 100644
--- a/src/ui/widgets/checklistbox.h
+++ b/src/ui/widgets/checklistbox.h
@@ -16,7 +16,7 @@ namespace ui::widgets
 class ListBox;
 class Checkbox;
 
-class CheckListBox : public Widget
+class CheckListBox final : public Widget
 {
 public:
   // getter, toggler, checkbox
@@ -32,11 +32,11 @@ class CheckListBox : public Widget
 
   void setSize(const glm::ivec2& size) override;
 
-  void update(bool hasFocus) override;
+  void tick(bool hasFocus) override;
 
   void fitToContent() override;
 
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
 
   gslu::nn_shared<Checkbox>
     addSetting(const gslu::nn_shared<Widget>& content, std::function<bool()>&& getter, std::function<void()>&& toggler);
diff --git a/src/ui/widgets/gridbox.cpp b/src/ui/widgets/gridbox.cpp
index 9e7ee87b3..0d3dbe7f7 100644
--- a/src/ui/widgets/gridbox.cpp
+++ b/src/ui/widgets/gridbox.cpp
@@ -7,7 +7,7 @@
 #include <cstddef>
 #include <functional>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <numeric>
 #include <stdexcept>
@@ -22,7 +22,7 @@ GridBox::GridBox(const glm::ivec2& separation)
 
 GridBox::~GridBox() = default;
 
-void GridBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
+void GridBox::draw(Ui& ui, const engine::Presenter& presenter) const
 {
   gsl_Assert(m_columnSizes.size() == m_widgets.shape()[0]);
   gsl_Assert(m_alignRight.size() == m_widgets.shape()[0]);
@@ -34,8 +34,7 @@ void GridBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
     int yPos = m_position.y;
     for(WidgetArray::size_type y = 0; y < m_widgets.shape()[1]; ++y)
     {
-      const auto widget = m_widgets[x][y];
-      if(widget != nullptr)
+      if(const auto widget = m_widgets[x][y]; widget != nullptr)
       {
         int alignment = 0;
         if(m_alignRight[x])
@@ -50,11 +49,11 @@ void GridBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
   }
 }
 
-void GridBox::set(size_t x, size_t y, const std::shared_ptr<Widget>& widget)
+void GridBox::set(const size_t x, const size_t y, const std::shared_ptr<Widget>& widget)
 {
   if(x >= m_widgets.shape()[0] || y >= m_widgets.shape()[1])
     BOOST_THROW_EXCEPTION(std::out_of_range("cell coordinates out of range"));
-  m_widgets[gsl::narrow<WidgetArray::index>(x)][gsl::narrow<WidgetArray::index>(y)] = widget;
+  m_widgets[gsl_lite::narrow<WidgetArray::index>(x)][gsl_lite::narrow<WidgetArray::index>(y)] = widget;
 }
 
 void GridBox::setPosition(const glm::ivec2& position)
@@ -62,7 +61,7 @@ void GridBox::setPosition(const glm::ivec2& position)
   m_position = position;
 }
 
-void GridBox::update(bool hasFocus)
+void GridBox::tick(const bool hasFocus)
 {
   for(WidgetArray::size_type x = 0; x < m_widgets.shape()[0]; ++x)
   {
@@ -72,7 +71,7 @@ void GridBox::update(bool hasFocus)
       if(widget == nullptr)
         continue;
 
-      widget->update(hasFocus && m_selected == std::tuple{x, y});
+      widget->tick(hasFocus && m_selected == std::tuple{x, y});
     }
   }
 }
@@ -126,14 +125,14 @@ void GridBox::fitToContent()
 
 void GridBox::recalculateTotalSize()
 {
-  auto totalWidth = std::accumulate(m_columnSizes.begin(), m_columnSizes.end(), 0, std::plus<>{});
+  auto totalWidth = std::accumulate(m_columnSizes.begin(), m_columnSizes.end(), 0, std::plus{});
   if(!m_columnSizes.empty())
-    totalWidth += gsl::narrow<int>(m_columnSizes.size() - 1) * m_separation.x;
+    totalWidth += gsl_lite::narrow<int>(m_columnSizes.size() - 1) * m_separation.x;
 
-  auto totalHeight = std::accumulate(m_rowSizes.begin(), m_rowSizes.end(), 0, std::plus<>{});
+  auto totalHeight = std::accumulate(m_rowSizes.begin(), m_rowSizes.end(), 0, std::plus{});
   if(!m_rowSizes.empty())
-    totalHeight += gsl::narrow<int>(m_rowSizes.size() - 1) * m_separation.y;
+    totalHeight += gsl_lite::narrow<int>(m_rowSizes.size() - 1) * m_separation.y;
 
   m_size = {totalWidth, totalHeight};
 }
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/gridbox.h b/src/ui/widgets/gridbox.h
index 04b700bbb..de0e643d3 100644
--- a/src/ui/widgets/gridbox.h
+++ b/src/ui/widgets/gridbox.h
@@ -18,7 +18,7 @@
 #endif
 #include <cstddef>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <tuple>
 #include <utility>
@@ -36,12 +36,12 @@ class Ui;
 
 namespace ui::widgets
 {
-class GridBox : public Widget
+class GridBox final : public Widget
 {
 public:
-  explicit GridBox(const glm::ivec2& separation = glm::ivec2{ui::OutlineBorderWidth, ui::OutlineBorderWidth});
+  explicit GridBox(const glm::ivec2& separation = glm::ivec2{OutlineBorderWidth, OutlineBorderWidth});
   ~GridBox() override;
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
 
   void set(size_t x, size_t y, const std::shared_ptr<Widget>& widget);
 
@@ -108,12 +108,12 @@ class GridBox : public Widget
 
   void setPosition(const glm::ivec2& position) override;
   void setSize(const glm::ivec2& size) override;
-  void update(bool hasFocus) override;
+  void tick(bool hasFocus) override;
   void fitToContent() override;
 
-  void setExtents(size_t x, size_t y)
+  void setExtents(const size_t x, const size_t y)
   {
-    m_widgets.resize(boost::extents[gsl::narrow<WidgetArray::index>(x)][gsl::narrow<WidgetArray::index>(y)]);
+    m_widgets.resize(boost::extents[gsl_lite::narrow<WidgetArray::index>(x)][gsl_lite::narrow<WidgetArray::index>(y)]);
     m_alignRight.resize(x, false);
     m_columnSizes.resize(x, 0);
     m_rowSizes.resize(y, 0);
@@ -128,13 +128,13 @@ class GridBox : public Widget
     };
   }
 
-  void setRowSize(size_t row, int height)
+  void setRowSize(const size_t row, const int height)
   {
     m_rowSizes.at(row) = height;
     recalculateTotalSize();
   }
 
-  void setColumnSize(size_t column, int width)
+  void setColumnSize(const size_t column, const int width)
   {
     m_columnSizes.at(column) = width;
     recalculateTotalSize();
@@ -145,11 +145,11 @@ class GridBox : public Widget
     return m_columnSizes;
   }
 
-  [[nodiscard]] const auto& getWidget(size_t x, size_t y) const
+  [[nodiscard]] const auto& getWidget(const size_t x, const size_t y) const
   {
     auto [sx, sy] = getExtents();
     gsl_Assert(x < sx && y < sy);
-    return m_widgets[gsl::narrow<WidgetArray::index>(x)][gsl::narrow<WidgetArray::index>(y)];
+    return m_widgets[gsl_lite::narrow<WidgetArray::index>(x)][gsl_lite::narrow<WidgetArray::index>(y)];
   }
 
   [[nodiscard]] const auto& getSelectedWidget() const
@@ -158,7 +158,7 @@ class GridBox : public Widget
     return getWidget(x, y);
   }
 
-  void setAlignRight(size_t column, bool right)
+  void setAlignRight(const size_t column, const bool right)
   {
     m_alignRight.at(column) = right;
   }
@@ -176,4 +176,4 @@ class GridBox : public Widget
   std::vector<int> m_columnSizes;
   std::vector<int> m_rowSizes;
 };
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/groupbox.cpp b/src/ui/widgets/groupbox.cpp
index 7c1ba2e5f..35c37b3b8 100644
--- a/src/ui/widgets/groupbox.cpp
+++ b/src/ui/widgets/groupbox.cpp
@@ -9,7 +9,7 @@
 
 #include <gl/pixel.h>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -19,11 +19,11 @@ namespace ui::widgets
 {
 constexpr int TitleOffset = 10;
 constexpr int InnerMargin = 10;
-constexpr int WidgetOffsetTop = ui::FontHeight / 2 + InnerMargin + ui::OutlineBorderWidth;
-constexpr int TotalVerticalMargin = WidgetOffsetTop + InnerMargin + 2 * ui::OutlineBorderWidth;
+constexpr int WidgetOffsetTop = FontHeight / 2 + InnerMargin + OutlineBorderWidth;
+constexpr int TotalVerticalMargin = WidgetOffsetTop + InnerMargin + 2 * OutlineBorderWidth;
 
 GroupBox::GroupBox(const std::string& title, gslu::nn_shared<Widget> widget)
-    : m_title{std::make_unique<ui::Text>(title)}
+    : m_title{std::make_unique<Text>(title)}
     , m_widget{std::move(widget)}
 {
   m_widget->setPosition(m_position + glm::ivec2{InnerMargin, WidgetOffsetTop});
@@ -31,10 +31,10 @@ GroupBox::GroupBox(const std::string& title, gslu::nn_shared<Widget> widget)
 
 GroupBox::~GroupBox() = default;
 
-void GroupBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
+void GroupBox::draw(Ui& ui, const engine::Presenter& presenter) const
 {
   const auto bgPos = m_position - glm::ivec2{OutlineBorderWidth, FontHeight / 2 - 1};
-  const auto bgSize = m_size - glm::ivec2{-2 * OutlineBorderWidth, ui::FontHeight / 2 + 2 * ui::OutlineBorderWidth};
+  const auto bgSize = m_size - glm::ivec2{-2 * OutlineBorderWidth, FontHeight / 2 + 2 * OutlineBorderWidth};
 
   UiBackdrop.draw(ui, bgPos, bgSize);
 
@@ -45,7 +45,7 @@ void GroupBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
   ui.drawOutlineBox(bgPos, bgSize);
 
   const auto bgPosTitle = m_position - glm::ivec2{OutlineBorderWidth - TitleOffset, FontHeight - 1};
-  const auto bgSizeTitle = glm::ivec2{m_title->getWidth() + 2 * OutlineBorderWidth, ui::FontHeight};
+  const auto bgSizeTitle = glm::ivec2{m_title->getWidth() + 2 * OutlineBorderWidth, FontHeight};
   ui.drawBox(bgPosTitle, bgSizeTitle, gl::SRGBA8{0, 0, 0, 255});
   ui.drawOutlineBox(bgPosTitle, bgSizeTitle);
   m_title->draw(ui, presenter.getTrFont(), m_position + glm::ivec2{TitleOffset, 0});
@@ -56,9 +56,9 @@ void GroupBox::setPosition(const glm::ivec2& position)
   m_position = position;
 }
 
-void GroupBox::update(bool hasFocus)
+void GroupBox::tick(const bool hasFocus)
 {
-  m_widget->update(hasFocus);
+  m_widget->tick(hasFocus);
 }
 
 glm::ivec2 GroupBox::getSize() const
@@ -78,6 +78,6 @@ void GroupBox::fitToContent()
 
 void GroupBox::setTitle(const std::string& title)
 {
-  m_title = gsl::make_unique<ui::Text>(title);
+  m_title = gsl_lite::make_unique<Text>(title);
 }
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/groupbox.h b/src/ui/widgets/groupbox.h
index 6ca927aeb..8f24d045e 100644
--- a/src/ui/widgets/groupbox.h
+++ b/src/ui/widgets/groupbox.h
@@ -24,7 +24,7 @@ class GroupBox : public Widget
 public:
   explicit GroupBox(const std::string& title, gslu::nn_shared<Widget> widget);
   ~GroupBox() override;
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
 
   [[nodiscard]] glm::ivec2 getSize() const override;
 
@@ -35,7 +35,7 @@ class GroupBox : public Widget
 
   void setPosition(const glm::ivec2& position) override;
   void setSize(const glm::ivec2& size) override;
-  void update(bool hasFocus) override;
+  void tick(bool hasFocus) override;
   void fitToContent() override;
 
   void setTitle(const std::string& title);
@@ -48,7 +48,7 @@ class GroupBox : public Widget
 private:
   glm::ivec2 m_position{0, 0};
   glm::ivec2 m_size{0, 0};
-  gslu::nn_unique<ui::Text> m_title;
+  gslu::nn_unique<Text> m_title;
   gslu::nn_shared<Widget> m_widget;
 };
 } // namespace ui::widgets
diff --git a/src/ui/widgets/label.cpp b/src/ui/widgets/label.cpp
index 43fe85f1e..66e677f2e 100644
--- a/src/ui/widgets/label.cpp
+++ b/src/ui/widgets/label.cpp
@@ -8,15 +8,15 @@
 #include <algorithm>
 #include <cstdint>
 #include <gl/pixel.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <string>
 
 namespace ui::widgets
 {
-Label::Label(const std::string& text, Label::Alignment alignment)
-    : m_text{std::make_unique<ui::Text>(text)}
-    , m_size{0, ui::FontHeight}
+Label::Label(const std::string& text, const Alignment alignment)
+    : m_text{std::make_unique<Text>(text)}
+    , m_size{0, FontHeight}
     , m_alignment{alignment}
 {
   fitToContent();
@@ -44,14 +44,14 @@ void Label::setSize(const glm::ivec2& size)
   m_size = size;
 }
 
-void Label::update(bool hasFocus)
+void Label::tick(const bool hasFocus)
 {
   constexpr int FadeSpeed = 30;
   const auto delta = hasFocus ? FadeSpeed : -FadeSpeed;
-  m_selectionAlpha = gsl::narrow_cast<uint8_t>(std::clamp(m_selectionAlpha + delta, 0, 255));
+  m_selectionAlpha = gsl_lite::narrow_cast<uint8_t>(std::clamp(m_selectionAlpha + delta, 0, 255));
 }
 
-void Label::draw(ui::Ui& ui, const engine::Presenter& presenter) const
+void Label::draw(Ui& ui, const engine::Presenter& presenter) const
 {
   if(m_selectionAlpha != 0)
   {
@@ -83,11 +83,11 @@ void Label::draw(ui::Ui& ui, const engine::Presenter& presenter) const
 
 void Label::fitToContent()
 {
-  m_size = {m_text->getWidth(), ui::FontHeight};
+  m_size = {m_text->getWidth(), FontHeight};
 }
 
 void Label::setText(const std::string& text)
 {
-  m_text = std::make_unique<ui::Text>(text);
+  m_text = std::make_unique<Text>(text);
 }
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/label.h b/src/ui/widgets/label.h
index 60b5c7fd8..e03ebdf4e 100644
--- a/src/ui/widgets/label.h
+++ b/src/ui/widgets/label.h
@@ -37,14 +37,14 @@ class Label final : public Widget
   [[nodiscard]] glm::ivec2 getSize() const override;
   void setPosition(const glm::ivec2& position) override;
   void setSize(const glm::ivec2& size) override;
-  void update(bool hasFocus) override;
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void tick(bool hasFocus) override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
   void fitToContent() override;
 
   void setText(const std::string& text);
 
 private:
-  std::unique_ptr<ui::Text> m_text;
+  std::unique_ptr<Text> m_text;
   glm::ivec2 m_position{0, 0};
   glm::ivec2 m_size;
   uint8_t m_selectionAlpha = 0;
diff --git a/src/ui/widgets/listbox.cpp b/src/ui/widgets/listbox.cpp
index c233e7fc9..fdd690aea 100644
--- a/src/ui/widgets/listbox.cpp
+++ b/src/ui/widgets/listbox.cpp
@@ -9,20 +9,20 @@
 #include <cstddef>
 #include <gl/pixel.h>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 
 namespace ui::widgets
 {
-ListBox::ListBox(size_t pageSize)
+ListBox::ListBox(const size_t pageSize)
     : m_pageSize{pageSize}
 {
 }
 
 ListBox::~ListBox() = default;
 
-void ListBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
+void ListBox::draw(Ui& ui, const engine::Presenter& presenter) const
 {
   size_t first = 0;
   size_t last = m_widgets.size();
@@ -39,26 +39,26 @@ void ListBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
   static const auto center = gl::SRGBA8{128, 64, 64, DefaultBackgroundAlpha};
   static const auto innerCorner = gl::SRGBA8{128, 64, 0, DefaultBackgroundAlpha};
   static const auto innerCenter = gl::SRGBA8{255, 255, 255, 255};
-  static const auto scrollIndicatorBottom = ui::BackgroundGouraud{
-    ui::BoxGouraud{
+  static const auto scrollIndicatorBottom = BackgroundGouraud{
+    BoxGouraud{
       outerCorner,
       outerCorner,
       center,
       outerCorner,
     },
-    ui::BoxGouraud{
+    BoxGouraud{
       outerCorner,
       outerCorner,
       outerCorner,
       center,
     },
-    ui::BoxGouraud{
+    BoxGouraud{
       center,
       outerCorner,
       innerCorner,
       innerCenter,
     },
-    ui::BoxGouraud{
+    BoxGouraud{
       outerCorner,
       center,
       innerCenter,
@@ -69,13 +69,12 @@ void ListBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
   if(first != 0)
   {
     scrollIndicatorBottom.mirroredY().draw(
-      ui, m_position - glm::ivec2{0, ui::FontHeight}, glm::ivec2{m_size.x, FontHeight});
+      ui, m_position - glm::ivec2{0, FontHeight}, glm::ivec2{m_size.x, FontHeight});
   }
   if(last != m_widgets.size())
   {
-    scrollIndicatorBottom.draw(ui,
-                               m_position + glm::ivec2{0, m_size.y - ui::FontHeight - 2 * ui::OutlineBorderWidth},
-                               glm::ivec2{m_size.x, FontHeight});
+    scrollIndicatorBottom.draw(
+      ui, m_position + glm::ivec2{0, m_size.y - FontHeight - 2 * OutlineBorderWidth}, glm::ivec2{m_size.x, FontHeight});
   }
 
   int y = m_position.y;
@@ -86,7 +85,7 @@ void ListBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
     widget->setSize({m_size.x, widget->getSize().y});
     widget->draw(ui, presenter);
 
-    y += widget->getSize().y + ui::OutlineBorderWidth;
+    y += widget->getSize().y + OutlineBorderWidth;
   }
 }
 
@@ -101,10 +100,10 @@ void ListBox::setPosition(const glm::ivec2& position)
   m_position = position;
 }
 
-void ListBox::update(bool hasFocus)
+void ListBox::tick(const bool hasFocus)
 {
   for(size_t i = 0; i < m_widgets.size(); ++i)
-    m_widgets[i]->update(hasFocus && m_selected == i);
+    m_widgets[i]->tick(hasFocus && m_selected == i);
 }
 
 glm::ivec2 ListBox::getSize() const
@@ -133,7 +132,7 @@ void ListBox::fitToContent()
     maxHeight = std::max(maxHeight, y);
     maxWidth = std::max(maxWidth, widget->getSize().x);
 
-    y += ui::OutlineBorderWidth;
+    y += OutlineBorderWidth;
   }
 
   m_size = {maxWidth, maxHeight};
@@ -150,4 +149,4 @@ size_t ListBox::getTotalPages() const
   BOOST_ASSERT(m_pageSize > 0);
   return (m_widgets.size() + m_pageSize - 1) / m_pageSize;
 }
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/listbox.h b/src/ui/widgets/listbox.h
index 16336b080..839157eba 100644
--- a/src/ui/widgets/listbox.h
+++ b/src/ui/widgets/listbox.h
@@ -4,7 +4,7 @@
 
 #include <cstddef>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <vector>
 
@@ -25,7 +25,7 @@ class ListBox : public Widget
 public:
   explicit ListBox(size_t pageSize = 0);
   ~ListBox() override;
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
 
   size_t append(const gslu::nn_shared<Widget>& widget);
 
@@ -74,7 +74,7 @@ class ListBox : public Widget
     return false;
   }
 
-  void setSelected(size_t idx)
+  void setSelected(const size_t idx)
   {
     gsl_Expects(idx < m_widgets.size());
     m_selected = idx;
@@ -89,7 +89,7 @@ class ListBox : public Widget
 
   void setPosition(const glm::ivec2& position) override;
   void setSize(const glm::ivec2& size) override;
-  void update(bool hasFocus) override;
+  void tick(bool hasFocus) override;
   void fitToContent() override;
 
   [[nodiscard]] const auto& getWidgets() const
@@ -112,4 +112,4 @@ class ListBox : public Widget
   size_t m_selected = 0;
   std::vector<gslu::nn_shared<Widget>> m_widgets;
 };
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/messagebox.cpp b/src/ui/widgets/messagebox.cpp
index 8292f9974..ac2e2efc7 100644
--- a/src/ui/widgets/messagebox.cpp
+++ b/src/ui/widgets/messagebox.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <boost/algorithm/string/split.hpp>
 #include <gl/pixel.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <iterator>
 #include <memory>
@@ -25,31 +25,29 @@ namespace
   std::vector<std::string> lines;
   boost::algorithm::split(lines,
                           text,
-                          [](char c)
+                          [](const char c)
                           {
                             return c == '\n';
                           });
   std::vector<gslu::nn_shared<Label>> labels;
-  std::transform(lines.begin(),
-                 lines.end(),
-                 std::back_inserter(labels),
-                 [](const std::string& line)
-                 {
-                   return gsl::make_shared<Label>(line);
-                 });
+  std::ranges::transform(lines,
+                         std::back_inserter(labels),
+                         [](const std::string& line)
+                         {
+                           return gsl_lite::make_shared<Label>(line);
+                         });
   return labels;
 }
 
 [[nodiscard]] std::vector<gslu::nn_shared<Label>> linesToLabels(const std::vector<std::string>& lines)
 {
   std::vector<gslu::nn_shared<Label>> labels;
-  std::transform(lines.begin(),
-                 lines.end(),
-                 std::back_inserter(labels),
-                 [](const std::string& line)
-                 {
-                   return gsl::make_shared<Label>(line);
-                 });
+  std::ranges::transform(lines,
+                         std::back_inserter(labels),
+                         [](const std::string& line)
+                         {
+                           return gsl_lite::make_shared<Label>(line);
+                         });
   return labels;
 }
 } // namespace
@@ -70,20 +68,20 @@ MessageBox::MessageBox(const std::vector<std::string>& labels)
 
 MessageBox::~MessageBox() = default;
 
-void MessageBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
+void MessageBox::draw(Ui& ui, const engine::Presenter& presenter) const
 {
   const auto center = m_position.x + getSize().x / 2;
-  int y = m_position.y + ui::FontHeight * 3 / 2;
+  int y = m_position.y + FontHeight * 3 / 2;
   for(const auto& q : m_questions)
   {
     q->setPosition({m_position.x + (getSize().x - q->getSize().x) / 2, y});
-    y += ui::FontHeight;
+    y += FontHeight;
   }
-  const auto answersWidth = m_yes->getSize().x + m_no->getSize().x + ui::FontHeight;
-  const auto answersX = center - answersWidth / 2 - ui::FontHeight / 2;
-  const auto answersY = m_position.y + ui::FontHeight * 5 / 2 + ui::FontHeight * m_questions.size();
+  const auto answersWidth = m_yes->getSize().x + m_no->getSize().x + FontHeight;
+  const auto answersX = center - answersWidth / 2 - FontHeight / 2;
+  const auto answersY = m_position.y + FontHeight * 5 / 2 + FontHeight * m_questions.size();
   m_yes->setPosition({answersX, answersY});
-  m_no->setPosition({answersX + m_yes->getSize().x + ui::FontHeight, answersY});
+  m_no->setPosition({answersX + m_yes->getSize().x + FontHeight, answersY});
 
   ui.drawBox(m_position, getSize(), gl::SRGBA8{0, 0, 0, DefaultBackgroundAlpha});
   ui.drawOutlineBox(m_position, getSize());
@@ -95,10 +93,10 @@ void MessageBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
   m_no->draw(ui, presenter);
 }
 
-void MessageBox::update(bool hasFocus)
+void MessageBox::tick(const bool hasFocus)
 {
-  m_yes->update(hasFocus && m_confirmed);
-  m_no->update(hasFocus && !m_confirmed);
+  m_yes->tick(hasFocus && m_confirmed);
+  m_no->tick(hasFocus && !m_confirmed);
 }
 
 void MessageBox::setPosition(const glm::ivec2& position)
@@ -113,14 +111,14 @@ glm::ivec2 MessageBox::getPosition() const
 
 glm::ivec2 MessageBox::getSize() const
 {
-  auto width = std::accumulate(m_questions.begin(),
-                               m_questions.end(),
-                               0,
-                               [](int width, auto& q)
-                               {
-                                 return std::max(width, q->getSize().x);
-                               });
-  return {width + 2 * ui::FontHeight, (3 + m_questions.size()) * ui::FontHeight};
+  const auto width = std::accumulate(m_questions.begin(),
+                                     m_questions.end(),
+                                     0,
+                                     [](int width, auto& q)
+                                     {
+                                       return std::max(width, q->getSize().x);
+                                     });
+  return {width + 2 * FontHeight, (3 + m_questions.size()) * FontHeight};
 }
 
 void MessageBox::setSize(const glm::ivec2& /*size*/)
@@ -130,4 +128,4 @@ void MessageBox::setSize(const glm::ivec2& /*size*/)
 void MessageBox::fitToContent()
 {
 }
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/messagebox.h b/src/ui/widgets/messagebox.h
index b787c8620..f730c7ca7 100644
--- a/src/ui/widgets/messagebox.h
+++ b/src/ui/widgets/messagebox.h
@@ -22,16 +22,16 @@ namespace ui::widgets
 {
 class Label;
 
-class MessageBox : public Widget
+class MessageBox final : public Widget
 {
 public:
   explicit MessageBox(const std::string& label);
   explicit MessageBox(const std::vector<std::string>& labels);
   ~MessageBox() override;
-  void update(bool hasFocus) override;
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void tick(bool hasFocus) override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
 
-  void setConfirmed(bool confirmed)
+  void setConfirmed(const bool confirmed)
   {
     m_confirmed = confirmed;
   }
diff --git a/src/ui/widgets/progressbar.cpp b/src/ui/widgets/progressbar.cpp
index efbf3f178..d96fe3822 100644
--- a/src/ui/widgets/progressbar.cpp
+++ b/src/ui/widgets/progressbar.cpp
@@ -4,25 +4,25 @@
 #include "ui/ui.h"
 
 #include <algorithm>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace ui::widgets
 {
 ProgressBar::~ProgressBar() = default;
 
-void ProgressBar::draw(ui::Ui& ui, const engine::Presenter& /*presenter*/) const
+void ProgressBar::draw(Ui& ui, const engine::Presenter& /*presenter*/) const
 {
-  static constexpr int InnerOffset = ui::OutlineBorderWidth + 1;
+  static constexpr int InnerOffset = OutlineBorderWidth + 1;
 
-  auto innerSize
-    = gsl::narrow_cast<int>(gsl::narrow_cast<float>(getSize().x - 2 * InnerOffset) * std::clamp(m_value, 0.0f, 1.0f));
-  ui.drawOutlineBox(m_position - glm::ivec2{0, ui::FontHeight - 1}, getSize());
-  ui.drawBox(m_position + glm::ivec2{InnerOffset, InnerOffset - ui::FontHeight + 1},
+  const auto innerSize = gsl_lite::narrow_cast<int>(gsl_lite::narrow_cast<float>(getSize().x - 2 * InnerOffset)
+                                                    * std::clamp(m_value, 0.0f, 1.0f));
+  ui.drawOutlineBox(m_position - glm::ivec2{0, FontHeight - 1}, getSize());
+  ui.drawBox(m_position + glm::ivec2{InnerOffset, InnerOffset - FontHeight + 1},
              glm::ivec2{innerSize + 1, getSize().y - 2 * InnerOffset + 1},
              15);
 }
 
-void ProgressBar::update(bool /*hasFocus*/)
+void ProgressBar::tick(bool /*hasFocus*/)
 {
 }
 
@@ -49,4 +49,4 @@ void ProgressBar::setSize(const glm::ivec2& size)
 void ProgressBar::fitToContent()
 {
 }
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/progressbar.h b/src/ui/widgets/progressbar.h
index 886c6f98a..d8ef25e5a 100644
--- a/src/ui/widgets/progressbar.h
+++ b/src/ui/widgets/progressbar.h
@@ -21,10 +21,10 @@ class ProgressBar : public Widget
 public:
   explicit ProgressBar() = default;
   ~ProgressBar() override;
-  void update(bool hasFocus) override;
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void tick(bool hasFocus) override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
 
-  void setValue(float value)
+  void setValue(const float value)
   {
     m_value = value;
   }
diff --git a/src/ui/widgets/selectionbox.cpp b/src/ui/widgets/selectionbox.cpp
index f91fb6dbe..55e197276 100644
--- a/src/ui/widgets/selectionbox.cpp
+++ b/src/ui/widgets/selectionbox.cpp
@@ -17,26 +17,26 @@
 
 namespace ui::widgets
 {
-SelectionBox::SelectionBox(const std::string& message, const std::vector<std::string>& options, size_t initialSelection)
+SelectionBox::SelectionBox(const std::string& message,
+                           const std::vector<std::string>& options,
+                           const size_t initialSelection)
     : m_container{std::make_shared<GridBox>()}
     , m_selected{initialSelection}
 {
   std::vector<std::string> lines;
   boost::split(lines, message, boost::is_any_of("\n"));
-  std::transform(lines.begin(),
-                 lines.end(),
-                 std::back_inserter(m_messageLines),
-                 [](const std::string& line)
-                 {
-                   return std::make_shared<Label>(line, Label::Alignment::Center);
-                 });
-  std::transform(options.begin(),
-                 options.end(),
-                 std::back_inserter(m_options),
-                 [](const std::string& label)
-                 {
-                   return std::make_shared<Label>(label, Label::Alignment::Center);
-                 });
+  std::ranges::transform(lines,
+                         std::back_inserter(m_messageLines),
+                         [](const std::string& line)
+                         {
+                           return std::make_shared<Label>(line, Label::Alignment::Center);
+                         });
+  std::ranges::transform(options,
+                         std::back_inserter(m_options),
+                         [](const std::string& label)
+                         {
+                           return std::make_shared<Label>(label, Label::Alignment::Center);
+                         });
 
   m_container->setExtents(1, m_messageLines.size() + m_options.size());
   for(size_t i = 0; i < m_messageLines.size(); ++i)
@@ -47,24 +47,22 @@ SelectionBox::SelectionBox(const std::string& message, const std::vector<std::st
 
 SelectionBox::SelectionBox(const std::vector<std::string>& message,
                            const std::vector<std::string>& options,
-                           size_t initialSelection)
+                           const size_t initialSelection)
     : m_container{std::make_shared<GridBox>()}
     , m_selected{initialSelection}
 {
-  std::transform(message.begin(),
-                 message.end(),
-                 std::back_inserter(m_messageLines),
-                 [](const std::string& line)
-                 {
-                   return std::make_shared<Label>(line, Label::Alignment::Center);
-                 });
-  std::transform(options.begin(),
-                 options.end(),
-                 std::back_inserter(m_options),
-                 [](const std::string& label)
-                 {
-                   return std::make_shared<Label>(label, Label::Alignment::Center);
-                 });
+  std::ranges::transform(message,
+                         std::back_inserter(m_messageLines),
+                         [](const std::string& line)
+                         {
+                           return std::make_shared<Label>(line, Label::Alignment::Center);
+                         });
+  std::ranges::transform(options,
+                         std::back_inserter(m_options),
+                         [](const std::string& label)
+                         {
+                           return std::make_shared<Label>(label, Label::Alignment::Center);
+                         });
 
   m_container->setExtents(1, m_messageLines.size() + m_options.size());
   for(size_t i = 0; i < m_messageLines.size(); ++i)
@@ -75,19 +73,19 @@ SelectionBox::SelectionBox(const std::vector<std::string>& message,
 
 SelectionBox::~SelectionBox() = default;
 
-void SelectionBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
+void SelectionBox::draw(Ui& ui, const engine::Presenter& presenter) const
 {
-  const auto bgPos = m_position - glm::ivec2{ui::FontHeight, 2 * ui::FontHeight};
-  const auto bgSize = m_size + glm::ivec2{2 * ui::FontHeight, 2 * ui::FontHeight};
+  const auto bgPos = m_position - glm::ivec2{FontHeight, 2 * FontHeight};
+  const auto bgSize = m_size + glm::ivec2{2 * FontHeight, 2 * FontHeight};
   ui.drawBox(bgPos, bgSize, gl::SRGBA8{0, 0, 0, DefaultBackgroundAlpha});
   ui.drawOutlineBox(bgPos, bgSize, 255);
   m_container->draw(ui, presenter);
 }
 
-void SelectionBox::update(bool hasFocus)
+void SelectionBox::tick(const bool hasFocus)
 {
   for(size_t i = 0; i < m_options.size(); ++i)
-    m_options[i]->update(hasFocus && m_selected == i);
+    m_options[i]->tick(hasFocus && m_selected == i);
 }
 
 void SelectionBox::setPosition(const glm::ivec2& position)
diff --git a/src/ui/widgets/selectionbox.h b/src/ui/widgets/selectionbox.h
index c57578bf8..d0f4014d9 100644
--- a/src/ui/widgets/selectionbox.h
+++ b/src/ui/widgets/selectionbox.h
@@ -23,7 +23,7 @@ namespace ui::widgets
 class GridBox;
 class Label;
 
-class SelectionBox : public Widget
+class SelectionBox final : public Widget
 {
 public:
   explicit SelectionBox(const std::string& message,
@@ -33,8 +33,8 @@ class SelectionBox : public Widget
                         const std::vector<std::string>& options,
                         size_t initialSelection = 0);
   ~SelectionBox() override;
-  void update(bool hasFocus) override;
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void tick(bool hasFocus) override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
 
   void setPosition(const glm::ivec2& position) override;
 
diff --git a/src/ui/widgets/sprite.cpp b/src/ui/widgets/sprite.cpp
index 6e4515848..156c70f26 100644
--- a/src/ui/widgets/sprite.cpp
+++ b/src/ui/widgets/sprite.cpp
@@ -7,7 +7,7 @@
 #include <cstdint>
 #include <gl/pixel.h>
 #include <glm/common.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <utility>
 
 namespace ui::widgets
@@ -19,7 +19,7 @@ Sprite::Sprite(engine::world::Sprite sprite)
 
 Sprite::~Sprite() = default;
 
-void Sprite::draw(ui::Ui& ui, const engine::Presenter& /*presenter*/) const
+void Sprite::draw(Ui& ui, const engine::Presenter& /*presenter*/) const
 {
   if(m_selectionAlpha != 0)
   {
@@ -31,11 +31,11 @@ void Sprite::draw(ui::Ui& ui, const engine::Presenter& /*presenter*/) const
   ui.draw(m_sprite, m_position);
 }
 
-void Sprite::update(bool hasFocus)
+void Sprite::tick(const bool hasFocus)
 {
   constexpr int FadeSpeed = 30;
   const auto delta = hasFocus ? FadeSpeed : -FadeSpeed;
-  m_selectionAlpha = gsl::narrow_cast<uint8_t>(std::clamp(m_selectionAlpha + delta, 0, 255));
+  m_selectionAlpha = gsl_lite::narrow_cast<uint8_t>(std::clamp(m_selectionAlpha + delta, 0, 255));
 }
 
 void Sprite::setPosition(const glm::ivec2& position)
@@ -60,6 +60,6 @@ void Sprite::setSize(const glm::ivec2& size)
 
 void Sprite::fitToContent()
 {
-  m_size = glm::max(m_sprite.render0, m_sprite.render1) + glm::ivec2{0, ui::FontHeight};
+  m_size = glm::max(m_sprite.render0, m_sprite.render1) + glm::ivec2{0, FontHeight};
 }
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/sprite.h b/src/ui/widgets/sprite.h
index cb9e3d7dd..5bbc1ac9b 100644
--- a/src/ui/widgets/sprite.h
+++ b/src/ui/widgets/sprite.h
@@ -18,13 +18,13 @@ class Presenter;
 
 namespace ui::widgets
 {
-class Sprite : public Widget
+class Sprite final : public Widget
 {
 public:
   explicit Sprite(engine::world::Sprite sprite);
   ~Sprite() override;
-  void update(bool hasFocus) override;
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void tick(bool hasFocus) override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
 
   void setPosition(const glm::ivec2& position) override;
 
diff --git a/src/ui/widgets/tabbox.cpp b/src/ui/widgets/tabbox.cpp
index a951f5293..62df8e909 100644
--- a/src/ui/widgets/tabbox.cpp
+++ b/src/ui/widgets/tabbox.cpp
@@ -11,7 +11,7 @@
 #include <engine/presenter.h>
 #include <gl/pixel.h>
 #include <glm/fwd.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <memory>
 #include <string>
@@ -20,8 +20,8 @@ namespace ui::widgets
 {
 constexpr int TitleOffset = 10;
 constexpr int InnerMargin = 10;
-constexpr int WidgetOffsetTop = ui::FontHeight / 2 + InnerMargin + ui::OutlineBorderWidth;
-constexpr int TotalVerticalMargin = WidgetOffsetTop + InnerMargin + 2 * ui::OutlineBorderWidth;
+constexpr int WidgetOffsetTop = FontHeight / 2 + InnerMargin + OutlineBorderWidth;
+constexpr int TotalVerticalMargin = WidgetOffsetTop + InnerMargin + 2 * OutlineBorderWidth;
 
 constexpr int checkboxSize = 6;
 
@@ -32,7 +32,7 @@ Tab::Tab(const std::string& title)
 
 Tab::~Tab() = default;
 
-void Tab::update(bool hasFocus)
+void Tab::tick(const bool hasFocus)
 {
   m_hasFocus = hasFocus;
 }
@@ -42,13 +42,13 @@ void Tab::fitToContent()
   m_size = m_title->getWidth() + glm::ivec2{2 * InnerMargin + checkboxSize, WidgetOffsetTop};
 }
 
-void Tab::draw(ui::Ui& ui, const engine::Presenter& presenter) const
+void Tab::draw(Ui& ui, const engine::Presenter& presenter) const
 {
   const auto bgPos = m_position - glm::ivec2{OutlineBorderWidth - TitleOffset, FontHeight - 1};
-  const auto bgSize = glm::ivec2{m_title->getWidth() + 2 * OutlineBorderWidth + checkboxSize * 2, ui::FontHeight};
+  const auto bgSize = glm::ivec2{m_title->getWidth() + 2 * OutlineBorderWidth + checkboxSize * 2, FontHeight};
   ui.drawBox(bgPos, bgSize, gl::SRGBA8{0, 0, 0, 255});
   ui.drawOutlineBox(bgPos, bgSize);
-  m_title->draw(ui, presenter.getTrFont(), (m_position + glm::ivec2{InnerMargin + checkboxSize * 2, 0}));
+  m_title->draw(ui, presenter.getTrFont(), m_position + glm::ivec2{InnerMargin + checkboxSize * 2, 0});
   if(m_hasFocus)
   {
     ui.drawBox(bgPos + glm::ivec2{5, 6}, glm::ivec2{checkboxSize, checkboxSize}, 15);
@@ -76,18 +76,18 @@ void TabBox::fitToContent()
     maxWidth = std::max(maxWidth, content->getSize().x);
   }
 
-  m_size = {maxWidth, maxHeight + ui::FontHeight};
+  m_size = {maxWidth, maxHeight + FontHeight};
 }
 
-void TabBox::update(bool /*hasFocus*/)
+void TabBox::tick(bool /*hasFocus*/)
 {
   for(size_t i = 0; i < m_tabs.size(); i++)
   {
-    m_tabs[i].container->update(i == m_selectedTabIndex);
+    m_tabs[i].container->tick(i == m_selectedTabIndex);
   }
 }
 
-void TabBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
+void TabBox::draw(Ui& ui, const engine::Presenter& presenter) const
 {
   int tabOffsetX = 0;
   for(const auto& [container, content] : m_tabs)
@@ -118,4 +118,4 @@ void TabBox::addTab(const gslu::nn_shared<Tab>& tab, const gslu::nn_shared<Widge
 {
   m_tabs.emplace_back(ContainerContent{tab, content});
 }
-} //namespace ui::widgets
+} //namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/tabbox.h b/src/ui/widgets/tabbox.h
index 7dcd6e0d2..432691757 100644
--- a/src/ui/widgets/tabbox.h
+++ b/src/ui/widgets/tabbox.h
@@ -21,13 +21,13 @@ class Text;
 
 namespace ui::widgets
 {
-class Tab : public ui::widgets::Widget
+class Tab : public Widget
 {
 public:
   explicit Tab(const std::string& title);
   ~Tab() override;
 
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
   [[nodiscard]] glm::ivec2 getSize() const override
   {
     return m_size;
@@ -44,7 +44,7 @@ class Tab : public ui::widgets::Widget
   {
     m_size = size;
   }
-  void update(bool hasFocus) override;
+  void tick(bool hasFocus) override;
   void fitToContent() override;
 
 private:
@@ -60,7 +60,7 @@ class TabBox : public Widget
   explicit TabBox();
   ~TabBox() override;
 
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
   [[nodiscard]] glm::ivec2 getSize() const override
   {
     return m_size;
@@ -77,7 +77,7 @@ class TabBox : public Widget
   {
     m_size = size;
   }
-  void update(bool hasFocus) override;
+  void tick(bool hasFocus) override;
   void fitToContent() override;
 
   void addTab(const gslu::nn_shared<Tab>& tab, const gslu::nn_shared<Widget>& content);
diff --git a/src/ui/widgets/textbox.cpp b/src/ui/widgets/textbox.cpp
index c410984a3..222af8d7c 100644
--- a/src/ui/widgets/textbox.cpp
+++ b/src/ui/widgets/textbox.cpp
@@ -14,8 +14,8 @@
 
 namespace ui::widgets
 {
-TextBox::TextBox(const std::string& text, int maxWidth, TextBox::Alignment alignment)
-    : m_size{maxWidth, ui::FontHeight}
+TextBox::TextBox(const std::string& text, const int maxWidth, const Alignment alignment)
+    : m_size{maxWidth, FontHeight}
     , m_alignment{alignment}
 {
   setText(text);
@@ -42,22 +42,22 @@ void TextBox::setSize(const glm::ivec2& size)
 {
   m_size = size;
   // re-flow the text
-  auto text = std::move(m_text);
+  const auto text = std::move(m_text);
   setText(text);
 }
 
-void TextBox::update(bool /*hasFocus*/)
+void TextBox::tick(bool /*hasFocus*/)
 {
 }
 
-void TextBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
+void TextBox::draw(Ui& ui, const engine::Presenter& presenter) const
 {
   const auto bgPos = m_position - glm::ivec2{OutlineBorderWidth, FontHeight - OutlineBorderWidth / 2};
   const auto bgSize = m_size + glm::ivec2{2 * OutlineBorderWidth, 0};
   ui.drawBox(bgPos, bgSize, gl::SRGBA8{0, 0, 0, DefaultBackgroundAlpha});
   ui.drawOutlineBox(bgPos, bgSize, 255);
 
-  int y = ui::FontHeight / 2;
+  int y = FontHeight / 2;
   for(const auto& line : m_lines)
   {
     auto x = 0;
@@ -73,22 +73,22 @@ void TextBox::draw(ui::Ui& ui, const engine::Presenter& presenter) const
       break;
     }
 
-    line->draw(ui, presenter.getTrFont(), {m_position.x + x + ui::FontHeight / 2, m_position.y + y});
-    y += ui::FontHeight;
+    line->draw(ui, presenter.getTrFont(), {m_position.x + x + FontHeight / 2, m_position.y + y});
+    y += FontHeight;
   }
 }
 
 void TextBox::fitToContent()
 {
-  auto maxWidth = std::accumulate(m_lines.begin(),
-                                  m_lines.end(),
-                                  0,
-                                  [](int width, auto& line)
-                                  {
-                                    return std::max(line->getWidth(), width);
-                                  });
-
-  m_size = {maxWidth + ui::FontHeight, ui::FontHeight * m_lines.size() + ui::FontHeight};
+  const auto maxWidth = std::accumulate(m_lines.begin(),
+                                        m_lines.end(),
+                                        0,
+                                        [](int width, auto& line)
+                                        {
+                                          return std::max(line->getWidth(), width);
+                                        });
+
+  m_size = {maxWidth + FontHeight, FontHeight * m_lines.size() + FontHeight};
 }
 
 void TextBox::setText(const std::string& text)
@@ -96,14 +96,13 @@ void TextBox::setText(const std::string& text)
   if(std::exchange(m_text, text) == text)
     return;
 
-  auto broken = breakLines(text, m_size.x - ui::FontHeight);
+  auto broken = breakLines(text, m_size.x - FontHeight);
   m_lines.clear();
-  std::transform(broken.begin(),
-                 broken.end(),
-                 std::back_inserter(m_lines),
-                 [](const auto& line)
-                 {
-                   return std::make_unique<ui::Text>(line);
-                 });
+  std::ranges::transform(broken,
+                         std::back_inserter(m_lines),
+                         [](const auto& line)
+                         {
+                           return std::make_unique<Text>(line);
+                         });
 }
 } // namespace ui::widgets
diff --git a/src/ui/widgets/textbox.h b/src/ui/widgets/textbox.h
index 9e3cbf899..f4c4e8045 100644
--- a/src/ui/widgets/textbox.h
+++ b/src/ui/widgets/textbox.h
@@ -38,15 +38,15 @@ class TextBox : public Widget
   [[nodiscard]] glm::ivec2 getSize() const override;
   void setPosition(const glm::ivec2& position) override;
   void setSize(const glm::ivec2& size) override;
-  void update(bool hasFocus) override;
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override;
+  void tick(bool hasFocus) override;
+  void draw(Ui& ui, const engine::Presenter& presenter) const override;
   void fitToContent() override;
 
   void setText(const std::string& text);
 
 private:
   std::string m_text;
-  std::vector<std::unique_ptr<ui::Text>> m_lines;
+  std::vector<std::unique_ptr<Text>> m_lines;
   glm::ivec2 m_position{0, 0};
   glm::ivec2 m_size;
   Alignment m_alignment = Alignment::Left;
diff --git a/src/ui/widgets/valueselector.h b/src/ui/widgets/valueselector.h
index 05d4f9f41..e5a660113 100644
--- a/src/ui/widgets/valueselector.h
+++ b/src/ui/widgets/valueselector.h
@@ -6,7 +6,7 @@
 #include <cstddef>
 #include <functional>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 #include <vector>
 
@@ -30,7 +30,7 @@ class ValueSelectorBase : public Widget
 };
 
 template<typename T>
-class ValueSelector : public ValueSelectorBase
+class ValueSelector final : public ValueSelectorBase
 {
 public:
   using DisplayTextProvider = std::function<std::string(const T&)>;
@@ -39,7 +39,7 @@ class ValueSelector : public ValueSelectorBase
   explicit ValueSelector(DisplayTextProvider&& displayTextProvider,
                          SelectionChangeHandler&& selectionChangeHandler,
                          std::vector<T> values,
-                         Label::Alignment alignment = Label::Alignment::Left)
+                         const Label::Alignment alignment = Label::Alignment::Left)
       : m_label{{}, alignment}
       , m_values{std::move(values)}
       , m_displayTextProvider{std::move(displayTextProvider)}
@@ -50,6 +50,7 @@ class ValueSelector : public ValueSelectorBase
     if(!m_values.empty())
       m_label.setText(m_displayTextProvider(m_values[0]));
   }
+
   ~ValueSelector() override = default;
 
   [[nodiscard]] glm::ivec2 getPosition() const override
@@ -72,12 +73,12 @@ class ValueSelector : public ValueSelectorBase
     m_label.setSize(size);
   }
 
-  void update(bool hasFocus) override
+  void tick(const bool hasFocus) override
   {
-    m_label.update(hasFocus);
+    m_label.tick(hasFocus);
   }
 
-  void draw(ui::Ui& ui, const engine::Presenter& presenter) const override
+  void draw(Ui& ui, const engine::Presenter& presenter) const override
   {
     m_label.draw(ui, presenter);
   }
@@ -127,4 +128,4 @@ class ValueSelector : public ValueSelectorBase
   DisplayTextProvider m_displayTextProvider;
   SelectionChangeHandler m_selectionChangeHandler;
 };
-} // namespace ui::widgets
+} // namespace ui::widgets
\ No newline at end of file
diff --git a/src/ui/widgets/widget.h b/src/ui/widgets/widget.h
index 092e33b07..1e4a659a9 100644
--- a/src/ui/widgets/widget.h
+++ b/src/ui/widgets/widget.h
@@ -23,9 +23,9 @@ class Widget
   [[nodiscard]] virtual glm::ivec2 getSize() const = 0;
   virtual void setPosition(const glm::ivec2& position) = 0;
   virtual void setSize(const glm::ivec2& size) = 0;
-  virtual void update(bool hasFocus) = 0;
+  virtual void tick(bool hasFocus) = 0;
   virtual void fitToContent() = 0;
 
-  virtual void draw(ui::Ui& ui, const engine::Presenter& presenter) const = 0;
+  virtual void draw(Ui& ui, const engine::Presenter& presenter) const = 0;
 };
 } // namespace ui::widgets
diff --git a/src/util/datetime.h b/src/util/datetime.h
index 0f3fa7ad0..da33d26bc 100644
--- a/src/util/datetime.h
+++ b/src/util/datetime.h
@@ -6,18 +6,16 @@
 #include <chrono>
 #include <ctime>
 #include <filesystem>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <iomanip>
 #include <sstream>
 #include <string>
 
 namespace util
 {
-[[nodiscard]] inline ::tm toLocalTime(std::time_t time)
+[[nodiscard]] inline tm toLocalTime(std::time_t time)
 {
-  struct tm localTimeData
-  {
-  };
+  struct tm localTimeData{};
 #ifdef WIN32
   gsl_Assert(localtime_s(&localTimeData, &time) == 0);
   return localTimeData;
@@ -27,7 +25,7 @@ namespace util
 #endif
 }
 
-[[nodiscard]] inline std::string toHumanReadableTimestamp(std::time_t time)
+[[nodiscard]] inline std::string toHumanReadableTimestamp(const std::time_t time)
 {
   const auto localTime = toLocalTime(time);
   return (boost::format("%04d-%02d-%02d %02d-%02d-%02d") % (localTime.tm_year + 1900) % (localTime.tm_mon + 1)
@@ -46,7 +44,7 @@ namespace util
   const auto timePoint
     = std::chrono::system_clock::to_time_t(std::chrono::time_point_cast<std::chrono::system_clock::duration>(
       saveTime - std::filesystem::file_time_type::clock::now() + std::chrono::system_clock::now()));
-  const auto localTime = util::toLocalTime(timePoint);
+  const auto localTime = toLocalTime(timePoint);
   std::stringstream timeStr;
   try
   {
@@ -57,7 +55,8 @@ namespace util
     timeStr.imbue(std::locale{});
   }
   timeStr << std::put_time(&localTime,
-                           /* translators: TR charmap encoding */ pgettext("SavegameTime", "%d %B %Y %X"));
+                           /* translators: TR charmap encoding */
+                           pgettext("SavegameTime", "%d %B %Y %X"));
   return timeStr.str();
 }
-} // namespace util
+} // namespace util
\ No newline at end of file
diff --git a/src/util/helpers.cpp b/src/util/helpers.cpp
index 5248d4af5..851987b5e 100644
--- a/src/util/helpers.cpp
+++ b/src/util/helpers.cpp
@@ -14,7 +14,7 @@
 #include <filesystem>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/mat4x4.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <stdexcept>
 #include <string>
 
@@ -110,7 +110,7 @@ std::string escape(const std::string& unescaped)
       result += ui::SzLig;
       break;
     default:
-      result += gsl::narrow_cast<char>(c);
+      result += gsl_lite::narrow_cast<char>(c);
       break;
     }
   }
@@ -160,14 +160,11 @@ core::Length sin(const core::Length& len, const core::Angle& rot)
   return tmp.cast<core::Length>();
 }
 
-glm::mat4 mix(const glm::mat4& a, const glm::mat4& b, const float bias)
+glm::mat4 lerp(const glm::mat4& a, const glm::mat4& b, const float alpha)
 {
   glm::mat4 result{0.0f};
-  const auto ap = value_ptr(a);
-  const auto bp = value_ptr(b);
-  const auto rp = value_ptr(result);
-  for(int i = 0; i < 16; ++i)
-    rp[i] = ap[i] * (1 - bias) + bp[i] * bias;
+  for(int i = 0; i < 4; ++i)
+    result[i] = a[i] * (1 - alpha) + b[i] * alpha;
   return result;
 }
 
@@ -179,18 +176,18 @@ int16_t rand15s()
 int16_t rand15()
 {
   // NOLINTNEXTLINE(cert-msc50-cpp, concurrency-mt-unsafe)
-  return gsl::narrow_cast<int16_t>(std::rand() % Rand15Max);
+  return gsl_lite::narrow_cast<int16_t>(std::rand() % Rand15Max);
 }
 
 std::string toTimeStr(const core::Seconds& t)
 {
-  static constexpr std::chrono::seconds Minute = std::chrono::seconds{60};
+  static constexpr auto Minute = std::chrono::seconds{60};
   static constexpr std::chrono::seconds Hour = 60 * Minute;
   if(t.get() >= Hour.count())
   {
     return /* translators: TR charmap encoding */ _("%1%:%2$02d:%3$02d",
                                                     t.get() / Hour.count(),
-                                                    (t.get() / Minute.count())
+                                                    t.get() / Minute.count()
                                                       % std::chrono::duration_cast<std::chrono::minutes>(Hour).count(),
                                                     t.get() % Minute.count());
   }
@@ -200,4 +197,4 @@ std::string toTimeStr(const core::Seconds& t)
       "%1$02d:%2$02d", t.get() / Minute.count(), t.get() % Minute.count());
   }
 }
-} // namespace util
+} // namespace util
\ No newline at end of file
diff --git a/src/util/helpers.h b/src/util/helpers.h
index cef0f8580..78dea229d 100644
--- a/src/util/helpers.h
+++ b/src/util/helpers.h
@@ -30,13 +30,13 @@ extern int16_t rand15();
  * Random value in range 0..(max-1).
  */
 template<typename T>
-inline T rand15(T max)
+T rand15(T max)
 {
   return static_cast<T>(static_cast<float>(max) * static_cast<float>(rand15()) / static_cast<float>(Rand15Max));
 }
 
 template<typename T, typename U>
-inline auto rand15(qs::quantity<T, U> max)
+auto rand15(qs::quantity<T, U> max)
 {
   return (max.template cast<float>() * static_cast<float>(rand15()) / static_cast<float>(Rand15Max)).template cast<U>();
 }
@@ -50,19 +50,19 @@ extern int16_t rand15s();
  * Random number in range -max/2..max/2
  */
 template<typename T, typename U>
-inline auto rand15s(qs::quantity<T, U> max)
+auto rand15s(qs::quantity<T, U> max)
 {
   return (max.template cast<float>() * static_cast<float>(rand15s()) / static_cast<float>(Rand15Max))
     .template cast<U>();
 }
 
 template<typename T>
-inline T rand15s(T max)
+T rand15s(T max)
 {
   return static_cast<T>(static_cast<float>(max) * static_cast<float>(rand15s()) / static_cast<float>(Rand15Max));
 }
 
-extern glm::mat4 mix(const glm::mat4& a, const glm::mat4& b, float bias);
+extern glm::mat4 lerp(const glm::mat4& a, const glm::mat4& b, float alpha);
 
 extern core::Length sin(const core::Length& len, const core::Angle& rot);
 
@@ -78,14 +78,14 @@ inline core::TRVec yawPitch(const core::Length& len, const core::TRRotation& rot
 
 extern core::TRVec pitch(const core::TRVec& vec, const core::Angle& rot);
 
-template<typename T>
-auto bits(T value, uint8_t shr, uint8_t n) -> std::enable_if_t<std::is_unsigned_v<T>, T>
+template<std::unsigned_integral T>
+T bits(const T value, const uint8_t shr, const uint8_t n)
 {
   return static_cast<T>(value >> shr) & ((1u << n) - 1u);
 }
 
 extern std::string unescape(const std::string& escaped);
-extern std::string escape(const std::string& escaped);
+extern std::string escape(const std::string& unescaped);
 
 extern std::filesystem::path ensureFileExists(const std::filesystem::path& path);
 
diff --git a/src/util/md5.cpp b/src/util/md5.cpp
index d16678d3a..e77616668 100644
--- a/src/util/md5.cpp
+++ b/src/util/md5.cpp
@@ -36,7 +36,7 @@ documentation and/or software.
 #include <array>
 #include <cstdint>
 #include <cstdio>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <string>
 
 constexpr size_t Blocksize = 64;
@@ -178,9 +178,9 @@ struct State
   // the message digest and zeroizing the context.
   void finalize()
   {
-    static const std::array<uint8_t, 64> padding{0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                                                 0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                                                 0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    static constexpr std::array<uint8_t, 64> padding{
+      0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
     if(!finalized)
     {
@@ -303,13 +303,13 @@ struct State
     size_t index = count[0] / 8 % Blocksize;
 
     // Update number of bits
-    const auto nBits = gsl::narrow_cast<uint32_t>(length << 3u);
+    const auto nBits = gsl_lite::narrow_cast<uint32_t>(length << 3u);
     count[0] += nBits;
     if(count[0] < nBits)
     {
       ++count[1];
     }
-    count[1] += gsl::narrow_cast<uint32_t>(length >> 29u);
+    count[1] += gsl_lite::narrow_cast<uint32_t>(length >> 29u);
 
     // number of bytes we need to fill in buffer
     const size_t firstpart = 64 - index;
@@ -370,4 +370,4 @@ std::string util::md5(const uint8_t* data, const size_t length)
   state.update(data, length);
   state.finalize();
   return state.hexdigest();
-}
+}
\ No newline at end of file
diff --git a/src/util/memaccess.h b/src/util/memaccess.h
index ed76eaf5d..6819acf90 100644
--- a/src/util/memaccess.h
+++ b/src/util/memaccess.h
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 
 namespace util
 {
@@ -30,4 +30,4 @@ constexpr uint32_t readUnaligned32LE(const uint8_t* data)
 {
   return readUnalignedLE<uint32_t>(data);
 }
-} // namespace util
+} // namespace util
\ No newline at end of file
diff --git a/src/video/avdecoder.cpp b/src/video/avdecoder.cpp
index 9f4475f29..3976b472e 100644
--- a/src/video/avdecoder.cpp
+++ b/src/video/avdecoder.cpp
@@ -10,11 +10,10 @@
 #include <algorithm>
 #include <boost/log/trivial.hpp>
 #include <boost/throw_exception.hpp>
-#include <cerrno>
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <mutex>
 #include <optional>
@@ -38,7 +37,7 @@ namespace video
 {
 namespace
 {
-std::string getAvError(int err)
+std::string getAvError(const int err)
 {
   std::vector<char> tmp(1024, 0);
   if(av_strerror(err, tmp.data(), tmp.size()) < 0)
@@ -127,9 +126,7 @@ std::optional<ffmpeg::AVFramePtr> AVDecoder::takeFrame()
   std::optional<ffmpeg::AVFramePtr> img;
   if(!imgQueue.empty())
   {
-    const auto delta = getVideoTs() - std::chrono::high_resolution_clock::now();
-
-    if(delta.count() > 0)
+    if(const auto delta = getVideoTs() - std::chrono::high_resolution_clock::now(); delta.count() > 0)
     {
       // video frame is in the future
       lock.unlock();
@@ -245,7 +242,7 @@ int AVDecoder::getChannels() const
   return audioDecoder->getChannels();
 }
 
-std::chrono::high_resolution_clock::time_point AVDecoder::getVideoTs()
+std::chrono::high_resolution_clock::time_point AVDecoder::getVideoTs() const
 {
   gsl_Assert(!imgQueue.empty());
 
@@ -253,4 +250,4 @@ std::chrono::high_resolution_clock::time_point AVDecoder::getVideoTs()
          + ffmpeg::toDuration<std::chrono::high_resolution_clock::duration>(imgQueue.front().frame->pts,
                                                                             videoStream->stream->time_base);
 }
-} // namespace video
+} // namespace video
\ No newline at end of file
diff --git a/src/video/avdecoder.h b/src/video/avdecoder.h
index cf713ac43..d011bc021 100644
--- a/src/video/avdecoder.h
+++ b/src/video/avdecoder.h
@@ -34,7 +34,7 @@ struct AVFramePtr;
 
 namespace video
 {
-struct AVDecoder final : public audio::AbstractStreamSource
+struct AVDecoder final : audio::AbstractStreamSource
 {
   AVFormatContext* fmtContext = nullptr;
   std::unique_ptr<audio::AudioStreamDecoder> audioDecoder;
@@ -82,7 +82,7 @@ struct AVDecoder final : public audio::AbstractStreamSource
   }
 
 private:
-  [[nodiscard]] std::chrono::high_resolution_clock::time_point getVideoTs();
+  [[nodiscard]] std::chrono::high_resolution_clock::time_point getVideoTs() const;
 
   std::chrono::high_resolution_clock::time_point m_playStart;
 };
diff --git a/src/video/converter.cpp b/src/video/converter.cpp
index 32690db75..c75918669 100644
--- a/src/video/converter.cpp
+++ b/src/video/converter.cpp
@@ -12,7 +12,7 @@
 #include <gl/texture2d.h>
 #include <gl/texturehandle.h>
 #include <glm/vec2.hpp>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <memory>
 #include <stdexcept>
 #include <vector>
@@ -30,7 +30,7 @@ namespace video
 {
 constexpr auto OutputPixFmt = AV_PIX_FMT_RGB24;
 
-Converter::Converter(const glm::ivec2& size, AVPixelFormat srcFormat)
+Converter::Converter(const glm::ivec2& size, const AVPixelFormat srcFormat)
     : size{size}
     , context{sws_getContext(size.x,
                              size.y,
@@ -43,8 +43,8 @@ Converter::Converter(const glm::ivec2& size, AVPixelFormat srcFormat)
                              nullptr,
                              nullptr)}
     , textureHandle{std::make_shared<gl::TextureHandle<gl::Texture2D<gl::SRGB8>>>(
-        gsl::make_shared<gl::Texture2D<gl::SRGB8>>(glm::ivec2{size.x, size.y}, "video"),
-        gsl::make_unique<gl::Sampler>("video" + gl::SamplerSuffix) | set(gl::api::TextureMagFilter::Linear))}
+        gsl_lite::make_shared<gl::Texture2D<gl::SRGB8>>(glm::ivec2{size.x, size.y}, "video"),
+        gsl_lite::make_unique<gl::Sampler>("video" + gl::SamplerSuffix) | set(gl::api::TextureMagFilter::Linear))}
 {
   if(context == nullptr)
   {
@@ -69,7 +69,7 @@ void Converter::update(const ffmpeg::AVFramePtr& videoFrame)
   }
 
   gsl_Assert(sws_scale(context,
-                       static_cast<const uint8_t* const*>(videoFrame.frame->data),
+                       videoFrame.frame->data,
                        videoFrame.frame->linesize,
                        0,
                        videoFrame.frame->height,
@@ -78,7 +78,7 @@ void Converter::update(const ffmpeg::AVFramePtr& videoFrame)
              == size.y);
 
   std::vector<gl::SRGB8> dstData;
-  dstData.resize(gsl::narrow_cast<size_t>(size.x * size.y), {0, 0, 0});
+  dstData.resize(gsl_lite::narrow_cast<size_t>(size.x * size.y), {0, 0, 0});
 
   // TODO this should get fixed
   gsl_Assert(dstVideoLinesize[0] == size.x * 3);
@@ -88,4 +88,4 @@ void Converter::update(const ffmpeg::AVFramePtr& videoFrame)
 
   textureHandle->getTexture()->assign(dstData);
 }
-} // namespace video
+} // namespace video
\ No newline at end of file
diff --git a/src/video/converter.h b/src/video/converter.h
index 83426a786..6efb06966 100644
--- a/src/video/converter.h
+++ b/src/video/converter.h
@@ -26,7 +26,7 @@ struct Converter final
   glm::ivec2 size;
   SwsContext* context;
   std::array<uint8_t*, 4> dstVideoData{nullptr};
-  std::array<int, 4> dstVideoLinesize{0};
+  std::array<int, 4> dstVideoLinesize{};
   gslu::nn_shared<gl::TextureHandle<gl::Texture2D<gl::SRGB8>>> textureHandle;
 
   explicit Converter(const glm::ivec2& size, AVPixelFormat srcFormat);
diff --git a/src/video/filtergraph.cpp b/src/video/filtergraph.cpp
index 489f05214..747f25416 100644
--- a/src/video/filtergraph.cpp
+++ b/src/video/filtergraph.cpp
@@ -5,7 +5,7 @@
 #include <array>
 #include <boost/throw_exception.hpp>
 #include <cstdio>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <stdexcept>
 
 extern "C"
@@ -45,7 +45,7 @@ void FilterGraph::init(const ffmpeg::Stream& stream)
            stream.stream->codecpar->sample_aspect_ratio.num,
            stream.stream->codecpar->sample_aspect_ratio.den);
   {
-    [[maybe_unused]] const auto check = gsl::ensure_z(filterGraphArgs.data(), filterGraphArgs.size());
+    gsl_Expects(std::ranges::find(filterGraphArgs.begin(), filterGraphArgs.end(), '\0') != filterGraphArgs.end());
   }
 
   if(avfilter_graph_create_filter(&input, avfilter_get_by_name("buffer"), "in", filterGraphArgs.data(), nullptr, graph)
@@ -73,4 +73,4 @@ void FilterGraph::init(const ffmpeg::Stream& stream)
   if(avfilter_graph_config(graph, nullptr) < 0)
     BOOST_THROW_EXCEPTION(std::runtime_error("Failed to configure filter graph"));
 }
-} // namespace video
+} // namespace video
\ No newline at end of file
diff --git a/src/video/videoplayer.cpp b/src/video/videoplayer.cpp
index 49a241f06..b9d28ad44 100644
--- a/src/video/videoplayer.cpp
+++ b/src/video/videoplayer.cpp
@@ -14,7 +14,7 @@
 #include <functional>
 #include <gl/pixel.h>
 #include <gl/soglb_fwd.h>
-#include <gsl/gsl-lite.hpp>
+#include <gsl-lite/gsl-lite.hpp>
 #include <gslu.h>
 #include <map>
 #include <memory>
@@ -52,8 +52,8 @@ void play(
     std::move(decoderPtr), audioDevice.getSampleRate() / 30, 4, std::chrono::milliseconds{0});
   stream->setLooping(true);
 
-  const auto streamFinisher = gsl::finally(
-    [&stream, &audioDevice]()
+  const auto streamFinisher = gsl_lite::finally(
+    [&stream, &audioDevice]
     {
       audioDevice.removeStream(stream.get());
     });
@@ -77,8 +77,8 @@ void play(
       }
 
       converter->update(*f);
-      decoder->stopped |= !onFrame(gsl::not_null{converter->textureHandle});
+      decoder->stopped |= !onFrame(gsl_lite::not_null{converter->textureHandle});
     }
   }
 }
-} // namespace video
+} // namespace video
\ No newline at end of file